From patchwork Tue Sep 17 13:48:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 275473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 113AC2C00DD for ; Tue, 17 Sep 2013 23:57:22 +1000 (EST) Received: from localhost ([::1]:41329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvmK-00075R-4K for incoming@patchwork.ozlabs.org; Tue, 17 Sep 2013 09:57:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvld-0006rS-5B for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvlW-0003dE-C9 for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:56:37 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:39098 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvhZ-0002On-8I for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:52:27 -0400 Received: (qmail 23570 invoked by uid 89); 17 Sep 2013 13:52:24 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.97.8/17868. hbedv: 8.2.12.120/7.11.102.228. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 3.972772 secs); 17 Sep 2013 13:52:24 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 17 Sep 2013 13:52:20 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id C5C18206B9; Tue, 17 Sep 2013 15:49:15 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 4EABA5FA1A; Tue, 17 Sep 2013 15:49:16 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 17 Sep 2013 15:48:52 +0200 Message-Id: <1379425736-11326-17-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv2 16/20] block/get_block_status: avoid redundant callouts on raw devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 461a1d7..64fca1b 100644 --- a/block.c +++ b/block.c @@ -3206,7 +3206,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) {