From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:58427)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Ui2rE-0001Kp-KY
	for qemu-devel@nongnu.org; Thu, 30 May 2013 09:25:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Ui2r9-0001dQ-3B
	for qemu-devel@nongnu.org; Thu, 30 May 2013 09:25:32 -0400
Received: from mx1.redhat.com ([209.132.183.28]:18728)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Ui2r8-0001cv-RY
	for qemu-devel@nongnu.org; Thu, 30 May 2013 09:25:27 -0400
Message-ID: <51A75312.9040600@redhat.com>
Date: Thu, 30 May 2013 15:24:34 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1369917299-5725-1-git-send-email-stefanha@redhat.com>
	<1369917299-5725-6-git-send-email-stefanha@redhat.com>
In-Reply-To: <1369917299-5725-6-git-send-email-stefanha@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v5 05/11] blockdev: use bdrv_getlength() in
	qmp_drive_mirror()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org, dietmar@proxmox.com, imain@redhat.com, xiawenc@linux.vnet.ibm.com

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