From patchwork Tue Feb 26 10:40:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 223194 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 560802C02C7 for ; Tue, 26 Feb 2013 21:44:13 +1100 (EST) Received: from localhost ([::1]:38469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI15-00066D-B0 for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 05:44:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI0J-0004zH-PB for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAI0D-0003o0-91 for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:23 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:44610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI0C-0003mO-6a for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:17 -0500 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Feb 2013 20:39:12 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 26 Feb 2013 20:39:10 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id DC2C03578023 for ; Tue, 26 Feb 2013 21:43:09 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1QAh7C65964256 for ; Tue, 26 Feb 2013 21:43:07 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1QAh97S016184 for ; Tue, 26 Feb 2013 21:43:09 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.152]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1QAeKOD012693; Tue, 26 Feb 2013 21:43:07 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 26 Feb 2013 18:40:22 +0800 Message-Id: <1361875228-15769-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1361875228-15769-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1361875228-15769-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13022610-1396-0000-0000-00000297C550 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V7 08/14] qmp: add interface query-images. 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, if specified backing image's info will also be returned. Now Qemu have both query-images and query-block interfaces. Signed-off-by: Wenchao Xia --- block.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 34 ++++++++++++++++++++++ qmp-commands.hx | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 79213d2..3976167 100644 --- a/block.c +++ b/block.c @@ -2954,6 +2954,89 @@ ImageInfo *bdrv_query_image_info(BlockDriverState *bs, Error **errp) return info; } +/* collect all info for one bs, p_list point to the empty tail to be filled, + return the empty tail of the new list. */ +static DeviceImageInfoList ** +collect_device_image_info_list(BlockDriverState *bs, + bool show_backing, + DeviceImageInfoList **p_list, + Error **errp) +{ + DeviceImageInfoList **p_next = p_list; + + while (bs) { + DeviceImageInfo *dii = g_malloc0(sizeof(*dii)); + DeviceImageInfoList *diil = g_malloc0(sizeof(*diil)); + diil->value = dii; + *p_next = diil; + p_next = &diil->next; + + dii->device = g_strdup(bs->device_name); + if (!bdrv_is_inserted(bs)) { + dii->has_image = false; + break; + } + dii->has_image = true; + dii->image = bdrv_query_image_info(bs, errp); + if (error_is_set(errp)) { + break; + } + + if (show_backing && bs->drv && bs->backing_hd) { + bs = bs->backing_hd; + } else { + bs = NULL; + } + } + return p_next; +} + +DeviceImageInfoList *qmp_query_images(bool has_device, + const char *device, + bool has_backing, + bool backing, + Error **errp) +{ + DeviceImageInfoList *head = NULL, **p_next = &head; + BlockDriverState *bs = NULL; + Error *err = NULL; + const char *target_device = NULL; + bool show_backing = false; + + if (has_device) { + target_device = device; + } + if (has_backing) { + show_backing = backing; + } + + if (target_device) { + bs = bdrv_find(device); + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return NULL; + } + collect_device_image_info_list(bs, show_backing, p_next, errp); + if (error_is_set(&err)) { + goto err; + } + } else { + QTAILQ_FOREACH(bs, &bdrv_states, list) { + p_next = collect_device_image_info_list(bs, show_backing, + p_next, errp); + if (error_is_set(&err)) { + goto err; + } + } + } + + return head; + + err: + qapi_free_DeviceImageInfoList(head); + return NULL; +} + BlockInfo *bdrv_query_block_info(BlockDriverState *bs) { BlockInfo *info = g_malloc0(sizeof(*info)); diff --git a/qapi-schema.json b/qapi-schema.json index cd7ea25..9122bb9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -245,6 +245,22 @@ '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'] } } ## +# @DeviceImageInfo: +# +# Information about an image used by a QEMU block device +# +# @device: name of the block device +# +# @image: #optional info of the image used +# +# Since: 1.5 +# +## + +{ 'type': 'DeviceImageInfo', + 'data': {'device': 'str', '*image': 'ImageInfo' } } + +## # @StatusInfo: # # Information about VCPU run state @@ -789,6 +805,24 @@ { 'command': 'query-block', 'returns': ['BlockInfo'] } ## +# @query-images: +# +# Get a list of DeviceImageInfo for all virtual block devices. +# +# @device: #optional the name of the device to get image info from. If not +# specified, all block devices will be queried +# @backing: #optional true to show information on backing images, false or +# omitted to show just the top image of a block device +# +# Returns: a list of @DeviceImageInfo describing each virtual block device +# +# Since: 1.5 +## +{ 'command': 'query-images', + 'data': { '*device': 'str', '*backing': 'bool' }, + 'returns': ['DeviceImageInfo'] } + +## # @BlockDeviceStats: # # Statistics of a virtual block device or a block backing device. diff --git a/qmp-commands.hx b/qmp-commands.hx index 799adea..292d61e 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1743,6 +1743,82 @@ EQMP }, SQMP +query-images +----------- + +Show the block devices' images. + +Each block image information is stored in a json-object and the returned value +is a json-array of all devices' images. + +Each json-object contain the following: + +- "device": device name (json-string) +- "image": related image information, it is a optional json-object containing the following: + - "filename": image file name (json-string) + - "format": image format (json-string) + - "virtual-size": maximum capacity in bytes of the image (json-int) + - "dirty-flag": true if image is not cleanly closed (json-bool, optional) + - "actual-size": actual size on disk in bytes of the image (json-int, optional) + - "cluster-size": size of a cluster in bytes (json-int, optional) + - "encrypted": true if the image is encrypted (json-bool, optional) + - "backing_file": backing file name (json-string, optional) + - "full-backing-filename": full path of the backing file (json-string, optional) + - "backing-filename-format": the format of the backing file (json-string, optional) + - "snapshots": the internal snapshot info, it is an optional list of json-object + containing the following: + - "id": unique snapshot id (json-string) + - "name": internal snapshot name (json-string) + - "vm-state-size": size of the VM state in bytes (json-int) + - "date-sec": UTC date of the snapshot in seconds (json-int) + - "date-nsec": fractional part in nano seconds to be used with date-sec(json-int) + - "vm-clock-sec": VM clock relative to boot in seconds (json-int) + - "vm-clock-nsec": fractional part in nano seconds to be used with vm-clock-sec (json-int) + +Example: + +-> { "execute": "query-images" } +<- { + "return":[ + { + "device":"ide0-hd0", + "image":{ + "filename":"disks/test0.img", + "format":"qcow2", + "virtual-size":1024000 + } + }, + { + "device":"ide0-hd1", + "image":{ + "filename":"disks/test1.img", + "format":"qcow2", + "virtual-size":2048000, + "snapshots":[ + { + "id": "1", + "name": "snapshot1", + "vm-state-size": 0, + "date-sec": 10000200, + "date-nsec": 12, + "vm-clock-sec": 206, + "vm-clock-nsec": 30 + } + ] + } + } + ] + } + +EQMP + + { + .name = "query-images", + .args_type = "device:B?, backing:-b", + .mhandler.cmd_new = qmp_marshal_input_query_images, + }, + +SQMP query-blockstats ----------------