| Message ID | 1369917299-5725-6-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
Il 30/05/2013 14:34, Stefan Hajnoczi ha scritto: > Use bdrv_getlength() for its byte units and error return instead of > bdrv_get_geometry(). > > Reported-by: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > blockdev.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 01db519..73b175b 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1364,7 +1364,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) { > @@ -1428,8 +1428,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); > Thanks! Paolo
On 05/30/2013 06:34 AM, Stefan Hajnoczi wrote: > Use bdrv_getlength() for its byte units and error return instead of > bdrv_get_geometry(). > > Reported-by: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > blockdev.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
Am 30.05.2013 um 14:34 hat Stefan Hajnoczi geschrieben: > Use bdrv_getlength() for its byte units and error return instead of > bdrv_get_geometry(). > > Reported-by: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
diff --git a/blockdev.c b/blockdev.c index 01db519..73b175b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1364,7 +1364,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) { @@ -1428,8 +1428,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);
Use bdrv_getlength() for its byte units and error return instead of bdrv_get_geometry(). Reported-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- blockdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)