* [Qemu-devel] [PATCH] block: add the optional file entry to query-block
@ 2013-06-28 14:32 Federico Simoncelli
2013-06-28 19:32 ` Eric Blake
2013-07-02 8:52 ` Stefan Hajnoczi
0 siblings, 2 replies; 4+ messages in thread
From: Federico Simoncelli @ 2013-06-28 14:32 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, 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 <fsimonce@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] block: add the optional file entry to query-block
2013-06-28 14:32 [Qemu-devel] [PATCH] block: add the optional file entry to query-block Federico Simoncelli
@ 2013-06-28 19:32 ` Eric Blake
2013-07-01 8:34 ` Kevin Wolf
2013-07-02 8:52 ` Stefan Hajnoczi
1 sibling, 1 reply; 4+ messages in thread
From: Eric Blake @ 2013-06-28 19:32 UTC (permalink / raw)
To: Federico Simoncelli; +Cc: kwolf, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]
On 06/28/2013 08:32 AM, Federico Simoncelli wrote:
> 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 <fsimonce@redhat.com>
> ---
> 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(-)
Reviewed-by: Eric Blake <eblake@redhat.com>
> +++ 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);
This change seems independently useful, but I'm not sure if it's worth
splitting out into a separate patch.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] block: add the optional file entry to query-block
2013-06-28 19:32 ` Eric Blake
@ 2013-07-01 8:34 ` Kevin Wolf
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2013-07-01 8:34 UTC (permalink / raw)
To: Eric Blake; +Cc: Federico Simoncelli, qemu-devel
Am 28.06.2013 um 21:32 hat Eric Blake geschrieben:
> On 06/28/2013 08:32 AM, Federico Simoncelli wrote:
> > 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 <fsimonce@redhat.com>
> > ---
> > 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(-)
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
> > +++ 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);
>
> This change seems independently useful, but I'm not sure if it's worth
> splitting out into a separate patch.
It probably is, because (a) it's a separate logical change and (b) this
isn't entirely correct. bdrv_getlength() can fail, so we need to do more
than just changing this one line. If bdrv_getlength() fails we should
error out instead of outputting a negative size.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] block: add the optional file entry to query-block
2013-06-28 14:32 [Qemu-devel] [PATCH] block: add the optional file entry to query-block Federico Simoncelli
2013-06-28 19:32 ` Eric Blake
@ 2013-07-02 8:52 ` Stefan Hajnoczi
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2013-07-02 8:52 UTC (permalink / raw)
To: Federico Simoncelli; +Cc: kwolf, qemu-devel
On Fri, Jun 28, 2013 at 10:32:30AM -0400, Federico Simoncelli wrote:
> 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 <fsimonce@redhat.com>
> ---
> 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)) {
Now total_sectors is unused. Why make this change?
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-07-02 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-28 14:32 [Qemu-devel] [PATCH] block: add the optional file entry to query-block Federico Simoncelli
2013-06-28 19:32 ` Eric Blake
2013-07-01 8:34 ` Kevin Wolf
2013-07-02 8:52 ` Stefan Hajnoczi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.