mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockdev: use bdrv_getlength() in qmp_drive_mirror()

Browse Source 
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>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2013-06-24 17:13:13 +02:00 committed by Kevin Wolf
parent cb78466ef6
commit ac3c5d831a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blockdev.c
View File

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