diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-06-26 13:23:25 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-15 15:07:13 +0200 |
| commit | 52bf1e722d996d1accfc35e29283f172d003d9b2 (patch) | |
| tree | 6244812b64390f1274615ba0bad9028d501505eb /block/qapi.c | |
| parent | d739f1c41094141268a33fa8fc6715fbab714fbe (diff) | |
| download | qemu-52bf1e722d996d1accfc35e29283f172d003d9b2.zip | |
block: Avoid bdrv_get_geometry() where errors should be detected
bdrv_get_geometry() hides errors. Use bdrv_nb_sectors() or
bdrv_getlength() instead where that's obviously inappropriate.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/qapi.c')
| -rw-r--r-- | block/qapi.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/block/qapi.c b/block/qapi.c index f44f6b4012..28ebb62c8e 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -165,19 +165,25 @@ void bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, Error **errp) { - uint64_t total_sectors; + int64_t size; const char *backing_filename; char backing_filename2[1024]; BlockDriverInfo bdi; int ret; Error *err = NULL; - ImageInfo *info = g_new0(ImageInfo, 1); + ImageInfo *info; - bdrv_get_geometry(bs, &total_sectors); + size = bdrv_getlength(bs); + if (size < 0) { + error_setg_errno(errp, -size, "Can't get size of device '%s'", + bdrv_get_device_name(bs)); + return; + } + info = g_new0(ImageInfo, 1); info->filename = g_strdup(bs->filename); info->format = g_strdup(bdrv_get_format_name(bs)); - info->virtual_size = total_sectors * 512; + info->virtual_size = size; info->actual_size = bdrv_get_allocated_file_size(bs); info->has_actual_size = info->actual_size >= 0; if (bdrv_is_encrypted(bs)) { |