From patchwork Tue Mar 27 11:43:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 148921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 31C46B6EE8 for ; Tue, 27 Mar 2012 22:44:33 +1100 (EST) Received: from localhost ([::1]:44189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCUpD-00030P-39 for incoming@patchwork.ozlabs.org; Tue, 27 Mar 2012 07:44:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCUp0-0002yN-OY for qemu-devel@nongnu.org; Tue, 27 Mar 2012 07:44:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCUou-0005uM-Hr for qemu-devel@nongnu.org; Tue, 27 Mar 2012 07:44:18 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:38929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCUou-0005th-BK for qemu-devel@nongnu.org; Tue, 27 Mar 2012 07:44:12 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 27 Mar 2012 05:44:09 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 27 Mar 2012 05:43:26 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 06187C40002 for ; Tue, 27 Mar 2012 05:43:25 -0600 (MDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2RBhPvU177792 for ; Tue, 27 Mar 2012 05:43:25 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2RBhOOR018770 for ; Tue, 27 Mar 2012 05:43:25 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2RBhLmc018611; Tue, 27 Mar 2012 05:43:22 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Tue, 27 Mar 2012 19:43:18 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Tue, 27 Mar 2012 19:43:17 +0800 Message-Id: <1332848597-8307-1-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12032711-2398-0000-0000-00000559F712 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.151 Cc: kwolf@redhat.com, pbonzini@redhat.com, Zhi Yong Wu , zwu.kernel@gmail.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 2/2] block: disable I/O throttling on sync api 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 From: Zhi Yong Wu Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- block.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 1fbf4dd..f0b4f38 100644 --- a/block.c +++ b/block.c @@ -1477,6 +1477,12 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, qemu_iovec_init_external(&qiov, &iov, 1); + if (bs->io_limits_enabled) { + fprintf(stderr, "Disabling I/O throttling on '%s' due " + "to synchronous I/O.\n", bdrv_get_device_name(bs)); + bdrv_io_limits_disable(bs); + } + if (qemu_in_coroutine()) { /* Fast-path if already in coroutine context */ bdrv_rw_co_entry(&rwco); @@ -1983,10 +1989,14 @@ static int guess_disk_lchs(BlockDriverState *bs, struct partition *p; uint32_t nr_sects; uint64_t nb_sectors; + bool enabled; bdrv_get_geometry(bs, &nb_sectors); + enabled = bs->io_limits_enabled; + bs->io_limits_enabled = false; ret = bdrv_read(bs, 0, buf, 1); + bs->io_limits_enabled = enabled; if (ret < 0) return -1; /* test msdos magic */