From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOSos-00062p-PQ for qemu-devel@nongnu.org; Tue, 24 Sep 2013 09:38:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOSon-0005BB-1f for qemu-devel@nongnu.org; Tue, 24 Sep 2013 09:38:26 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:39215 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOSom-0005A8-Nd for qemu-devel@nongnu.org; Tue, 24 Sep 2013 09:38:20 -0400 From: Peter Lieven Date: Tue, 24 Sep 2013 15:35:10 +0200 Message-Id: <1380029714-5239-17-git-send-email-pl@kamp.de> In-Reply-To: <1380029714-5239-1-git-send-email-pl@kamp.de> References: <1380029714-5239-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv3 16/20] block/get_block_status: avoid redundant callouts on raw devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com if a raw device like an iscsi target or host device is used the current implementation makes a second call out to get the block status of bs->file. however, the raw driver already has called bdrv_get_block_status on bs->file. Reviewed-by: Eric Blake Signed-off-by: Peter Lieven --- block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 3bf1163..f56660d 100644 --- a/block.c +++ b/block.c @@ -3277,7 +3277,8 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, if (bs->file && (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && - (ret & BDRV_BLOCK_OFFSET_VALID)) { + (ret & BDRV_BLOCK_OFFSET_VALID) && + strcmp(bs->drv->format_name, "raw")) { ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS, *pnum, pnum); if (ret2 >= 0) { -- 1.7.9.5