From patchwork Sat Dec 29 08:45:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 208638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2FADC2C00EC for ; Sat, 29 Dec 2012 20:26:34 +1100 (EST) Received: from localhost ([::1]:56666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5h-0005fe-Vb for incoming@patchwork.ozlabs.org; Sat, 29 Dec 2012 03:48:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5U-0005RU-9n for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tos5S-0005Oc-RH for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:12 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:39410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5S-0005OP-6H for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:10 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Dec 2012 14:16:57 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 29 Dec 2012 14:16:55 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 30470E004B for ; Sat, 29 Dec 2012 14:18:07 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBT8m4Rq49414184 for ; Sat, 29 Dec 2012 14:18:04 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBT8m5sS021792 for ; Sat, 29 Dec 2012 19:48:05 +1100 Received: from RedHat62GAWSWenchao ([9.125.29.43]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBT8jCUi014358; Sat, 29 Dec 2012 19:48:02 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 29 Dec 2012 16:45:20 +0800 Message-Id: <1356770725-4804-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12122908-2000-0000-0000-00000A6AEA46 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: kwolf@redhat.com, aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 06/11] qmp: add interface query-image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This mirror function will return all image info including snapshots. Now Qemu have both query-image and query-block interfaces, and qemu-img share the code for image info retrieving with qemu emulator. Signed-off-by: Wenchao Xia --- block.c | 16 ++++++++++++++++ qapi-schema.json | 11 +++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 9dcecec..0e9f414 100644 --- a/block.c +++ b/block.c @@ -2964,6 +2964,22 @@ ImageInfo *bdrv_query_image_info(BlockDriverState *bs, Error **errp) return info; } +ImageInfoList *qmp_query_image(Error **errp) +{ + ImageInfoList *head = NULL, **p_next = &head; + BlockDriverState *bs; + + QTAILQ_FOREACH(bs, &bdrv_states, list) { + ImageInfoList *info = g_malloc0(sizeof(*info)); + info->value = bdrv_query_image_info(bs, NULL); + + *p_next = info; + p_next = &info->next; + } + + return head; +} + BlockInfo *bdrv_query_block_info(BlockDriverState *bs) { BlockInfo *info = g_malloc0(sizeof(*info)); diff --git a/qapi-schema.json b/qapi-schema.json index 5dfa052..40f96f3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -720,6 +720,17 @@ { 'command': 'query-block', 'returns': ['BlockInfo'] } ## +# @query-image: +# +# Get a list of BlockImage for all virtual block devices. +# +# Returns: a list of @BlockImage describing each virtual block device +# +# Since: 1.4 +## +{ 'command': 'query-image', 'returns': ['ImageInfo'] } + +## # @BlockDeviceStats: # # Statistics of a virtual block device or a block backing device.