From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsZcA-0005Xa-LU for qemu-devel@nongnu.org; Fri, 28 Jun 2013 10:25:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsZc6-0003q2-KU for qemu-devel@nongnu.org; Fri, 28 Jun 2013 10:25:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsZc6-0003pr-AZ for qemu-devel@nongnu.org; Fri, 28 Jun 2013 10:25:26 -0400 From: Kevin Wolf Date: Fri, 28 Jun 2013 16:24:55 +0200 Message-Id: <1372429509-29642-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1372429509-29642-1-git-send-email-kwolf@redhat.com> References: <1372429509-29642-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 06/20] blockdev: use bdrv_getlength() in qmp_drive_mirror() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi Use bdrv_getlength() for its byte units and error return instead of bdrv_get_geometry(). Reported-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- blockdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index c17b525..445f6e1 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); -- 1.8.1.4