From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtEKA-0003wc-Oo for qemu-devel@nongnu.org; Thu, 10 Jan 2013 04:21:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtEK8-0000DF-7L for qemu-devel@nongnu.org; Thu, 10 Jan 2013 04:21:22 -0500 Received: from ssl.dlhnet.de ([91.198.192.8]:50353 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtEK8-0000DA-0o for qemu-devel@nongnu.org; Thu, 10 Jan 2013 04:21:20 -0500 Message-ID: <50EE8810.7080507@dlhnet.de> Date: Thu, 10 Jan 2013 10:21:20 +0100 From: Peter Lieven MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] block: init bs->io_base correctly to avoid locking List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "qemu-devel@nongnu.org" Cc: kwolf@redhat.com, Paolo Bonzini If io_limits are specified during runtime that exceed the number of operations in flight bs->io_base is not initialized in the else statement in bdrv_exceed_io_limits(). The wait time calculated in bdrv_exceed_{bps,iops}_limits is thus totally wrong and the machine locks. Signed-off-by: Peter Lieven --- block.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block.c b/block.c index 4e28c55..309aa85 100644 --- a/block.c +++ b/block.c @@ -159,6 +159,10 @@ void bdrv_io_limits_enable(BlockDriverState *bs) bs->slice_start = qemu_get_clock_ns(vm_clock); bs->slice_end = bs->slice_start + bs->slice_time; memset(&bs->io_base, 0, sizeof(bs->io_base)); + bs->io_base.bytes[0] = bs->nr_bytes[0]; + bs->io_base.bytes[1] = bs->nr_bytes[1]; + bs->io_base.ios[0] = bs->nr_ops[0]; + bs->io_base.ios[1] = bs->nr_ops[1]; bs->io_limits_enabled = true; } -- 1.7.9.5