Patchwork [v6,05/12] blockdev: use bdrv_getlength() in qmp_drive_mirror()

login
register
mail settings
Submitter Stefan Hajnoczi
Date June 24, 2013, 3:13 p.m.
Message ID <1372086800-4720-6-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/253880/
State New
Headers show

Comments

Stefan Hajnoczi - June 24, 2013, 3:13 p.m.
Use bdrv_getlength() for its byte units and error return instead of
bdrv_get_geometry().

Reported-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 blockdev.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/blockdev.c b/blockdev.c
index f6938d3..911aeb8 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1371,7 +1371,7 @@  void qmp_drive_mirror(const char *device, const char *target,
     BlockDriver *drv = NULL;
     Error *local_err = NULL;
     int flags;
-    uint64_t size;
+    int64_t size;
     int ret;
 
     if (!has_speed) {
@@ -1435,8 +1435,12 @@  void qmp_drive_mirror(const char *device, const char *target,
         sync = MIRROR_SYNC_MODE_FULL;
     }
 
-    bdrv_get_geometry(bs, &size);
-    size *= 512;
+    size = bdrv_getlength(bs);
+    if (size < 0) {
+        error_setg_errno(errp, -size, "bdrv_getlength failed");
+        return;
+    }
+
     if (sync == MIRROR_SYNC_MODE_FULL && mode != NEW_IMAGE_MODE_EXISTING) {
         /* create new image w/o backing file */
         assert(format && drv);