From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57972)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1X88KY-0002CH-Io
	for qemu-devel@nongnu.org; Fri, 18 Jul 2014 09:36:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1X88KS-00038b-Ev
	for qemu-devel@nongnu.org; Fri, 18 Jul 2014 09:36:10 -0400
Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]:61191)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1X88KS-00038D-8F
	for qemu-devel@nongnu.org; Fri, 18 Jul 2014 09:36:04 -0400
Received: by mail-we0-f181.google.com with SMTP id k48so3379547wev.26
	for <qemu-devel@nongnu.org>; Fri, 18 Jul 2014 06:36:02 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <53C922BD.20408@redhat.com>
Date: Fri, 18 Jul 2014 15:35:57 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1405597808-15975-1-git-send-email-namei.unix@gmail.com>
In-Reply-To: <1405597808-15975-1-git-send-email-namei.unix@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] block/quorum: implement
	.bdrv_co_get_block_status
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: Liu Yuan <namei.unix@gmail.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Benoit Canet <benoit@irqsave.net>, Stefan Hajnoczi <stefanha@redhat.com>

Il 17/07/2014 13:50, Liu Yuan ha scritto:
> - allow drive-mirror to create sprase mirror on images like qcow2
> - allow qemu-img map to work as expected on quorum driver
> 
> Cc: Benoit Canet <benoit@irqsave.net>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> ---
>  block/quorum.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 
> diff --git a/block/quorum.c b/block/quorum.c
> index ebf5c71..f0d0a98 100644
> --- a/block/quorum.c
> +++ b/block/quorum.c
> @@ -780,6 +780,21 @@ static coroutine_fn int quorum_co_flush(BlockDriverState *bs)
>      return result;
>  }
>  
> +static int64_t coroutine_fn quorum_co_get_block_status(BlockDriverState *bs,
> +                                                       int64_t sector_num,
> +                                                       int nb_sectors,
> +                                                       int *pnum)
> +{
> +    BDRVQuorumState *s = bs->opaque;
> +    BlockDriverState *child_bs = s->bs[0];
> +
> +    if (child_bs->drv->bdrv_co_get_block_status)
> +        return child_bs->drv->bdrv_co_get_block_status(child_bs, sector_num,
> +                                                       nb_sectors, pnum);

Is this "if" necessary?

> +    return bdrv_get_block_status(child_bs, sector_num, nb_sectors, pnum);

Also, the definition of BDRV_BLOCK_OFFSET_VALID explicitly refers to
bs->file, so you probably have to exclude it from the result as well as
BDRV_BLOCK_RAW.

Paolo

> +
>  static bool quorum_recurse_is_first_non_filter(BlockDriverState *bs,
>                                                 BlockDriverState *candidate)
>  {
> @@ -1038,6 +1053,7 @@ static BlockDriver bdrv_quorum = {
>      .bdrv_close                         = quorum_close,
>  
>      .bdrv_co_flush_to_disk              = quorum_co_flush,
> +    .bdrv_co_get_block_status           = quorum_co_get_block_status,
>  
>      .bdrv_getlength                     = quorum_getlength,
>  
>