From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56479)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1a1C4Q-0002yT-Vd
	for qemu-devel@nongnu.org; Tue, 24 Nov 2015 06:47:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1a1C4Q-0002CS-5F
	for qemu-devel@nongnu.org; Tue, 24 Nov 2015 06:47:38 -0500
References: <1448342531-16407-1-git-send-email-famz@redhat.com>
	<1448342531-16407-2-git-send-email-famz@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <56544E4F.9090104@redhat.com>
Date: Tue, 24 Nov 2015 12:47:27 +0100
MIME-Version: 1.0
In-Reply-To: <1448342531-16407-2-git-send-email-famz@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH for-2.6 01/14] block: Add "file" output
 parameter to block status query functions
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: Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Jeff Cody <jcody@redhat.com>, Peter Lieven <pl@kamp.de>, qemu-block@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>



On 24/11/2015 06:21, Fam Zheng wrote:
> +    if (bs->file && *file == bs->file->bs &&

This check is unnecessary, just use "if (file)".

Paolo

>          (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
>          (ret & BDRV_BLOCK_OFFSET_VALID)) {
> +        BlockDriverState *file2;
>          int file_pnum;
>  
> -        ret2 = bdrv_co_get_block_status(bs->file->bs, ret >> BDRV_SECTOR_BITS,
> -                                        *pnum, &file_pnum);
> +        ret2 = bdrv_co_get_block_status(*file, ret >> BDRV_SECTOR_BITS,
> +                                        *pnum, &file_pnum, &file2);