From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsZjy-0000na-Pu for qemu-devel@nongnu.org; Fri, 28 Jun 2013 10:33:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsZjw-0007OO-Re for qemu-devel@nongnu.org; Fri, 28 Jun 2013 10:33:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsZjw-0007Nw-Iq for qemu-devel@nongnu.org; Fri, 28 Jun 2013 10:33:32 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5SEXVaR001556 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 28 Jun 2013 10:33:31 -0400 From: Federico Simoncelli Date: Fri, 28 Jun 2013 10:32:30 -0400 Message-Id: <1372429950-20923-1-git-send-email-fsimonce@redhat.com> Subject: [Qemu-devel] [PATCH] block: add the optional file entry to query-block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Federico Simoncelli This patch adds the optional file entry to the query-block output. The value is a json-object representing the information about the underlying file or device (when present). Signed-off-by: Federico Simoncelli --- block/qapi.c | 9 ++++++++- qapi-schema.json | 4 +++- qmp-commands.hx | 8 ++++++++ tests/qemu-iotests/043.out | 15 +++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index a4bc411..03cd222 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -119,7 +119,7 @@ void bdrv_query_image_info(BlockDriverState *bs, info->filename = g_strdup(bs->filename); info->format = g_strdup(bdrv_get_format_name(bs)); - info->virtual_size = total_sectors * 512; + info->virtual_size = bdrv_getlength(bs); info->actual_size = bdrv_get_allocated_file_size(bs); info->has_actual_size = info->actual_size >= 0; if (bdrv_is_encrypted(bs)) { @@ -171,6 +171,13 @@ void bdrv_query_image_info(BlockDriverState *bs, return; } + if (bs->file) { + bdrv_query_image_info(bs->file, &info->file, &err); + if (info->file) { + info->has_file = true; + } + } + *p_info = info; } diff --git a/qapi-schema.json b/qapi-schema.json index a30a728..524a4a0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -238,6 +238,8 @@ # # @backing-image: #optional info of the backing image (since 1.6) # +# @file: #optional info of the underlying file (since 1.6) +# # Since: 1.3 # ## @@ -248,7 +250,7 @@ '*cluster-size': 'int', '*encrypted': 'bool', '*backing-filename': 'str', '*full-backing-filename': 'str', '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'], - '*backing-image': 'ImageInfo' } } + '*backing-image': 'ImageInfo', '*file': 'ImageInfo' } } ## # @ImageCheck: diff --git a/qmp-commands.hx b/qmp-commands.hx index 8cea5e5..c25ac77 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1745,6 +1745,8 @@ Each json-object contain the following: - "backing-image": the detail of the backing image, it is an optional json-object only present when a backing image present for this image + - "file": an optional json-object representing the information + about the underlying file or device (when present) - "io-status": I/O operation status, only present if the device supports it and the VM is configured to stop on errors. It's always reset @@ -1796,6 +1798,12 @@ Example: "format":"qcow2", "virtual-size":2048000 } + "file":{ + "filename":"disks/test.qcow2", + "format": "file", + "virtual-size": 262144, + "actual-size": 139264 + } } }, "type":"unknown" diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out index ad23337..6aea37b 100644 --- a/tests/qemu-iotests/043.out +++ b/tests/qemu-iotests/043.out @@ -44,6 +44,11 @@ cluster_size: 65536 "filename": "TEST_DIR/t.IMGFMT", "cluster-size": 65536, "format": "IMGFMT", + "file": { + "virtual-size": 327680, + "filename": "TEST_DIR/t.IMGFMT", + "format": "file", + }, "backing-filename": "TEST_DIR/t.IMGFMT.2.base", "dirty-flag": false }, @@ -52,6 +57,11 @@ cluster_size: 65536 "filename": "TEST_DIR/t.IMGFMT.2.base", "cluster-size": 65536, "format": "IMGFMT", + "file": { + "virtual-size": 327680, + "filename": "TEST_DIR/t.IMGFMT.2.base", + "format": "file", + }, "backing-filename": "TEST_DIR/t.IMGFMT.1.base", "dirty-flag": false }, @@ -60,6 +70,11 @@ cluster_size: 65536 "filename": "TEST_DIR/t.IMGFMT.1.base", "cluster-size": 65536, "format": "IMGFMT", + "file": { + "virtual-size": 327680, + "filename": "TEST_DIR/t.IMGFMT.1.base", + "format": "file", + }, "dirty-flag": false } ] -- 1.7.1