From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YmlLa-0003dg-Po for qemu-devel@nongnu.org; Mon, 27 Apr 2015 11:53:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YmlLW-0000gY-Ss for qemu-devel@nongnu.org; Mon, 27 Apr 2015 11:53:26 -0400 From: Stefan Hajnoczi Date: Mon, 27 Apr 2015 16:53:10 +0100 Message-Id: <1430149991-29850-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1430149991-29850-1-git-send-email-stefanha@redhat.com> References: <1430149991-29850-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v3 1/2] block: replace bdrv_states iteration with bdrv_next() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org The bdrv_states list is a static variable in block.c. bdrv_drain_all() and bdrv_flush_all() use this variable to iterate over all drives. The next patch will move bdrv_drain_all() and bdrv_flush_all() out of block.c so it's necessary to switch to the public bdrv_next() interface. Signed-off-by: Stefan Hajnoczi --- block.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index ec23594..1f0a4e2 100644 --- a/block.c +++ b/block.c @@ -2051,9 +2051,9 @@ void bdrv_drain_all(void) { /* Always run first iteration so any pending completion BHs run */ bool busy = true; - BlockDriverState *bs; + BlockDriverState *bs = NULL; - QTAILQ_FOREACH(bs, &bdrv_states, device_list) { + while ((bs = bdrv_next(bs))) { AioContext *aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); @@ -2065,8 +2065,9 @@ void bdrv_drain_all(void) while (busy) { busy = false; + bs = NULL; - QTAILQ_FOREACH(bs, &bdrv_states, device_list) { + while ((bs = bdrv_next(bs))) { AioContext *aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); @@ -2075,7 +2076,8 @@ void bdrv_drain_all(void) } } - QTAILQ_FOREACH(bs, &bdrv_states, device_list) { + bs = NULL; + while ((bs = bdrv_next(bs))) { AioContext *aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); @@ -4015,10 +4017,10 @@ int bdrv_get_flags(BlockDriverState *bs) int bdrv_flush_all(void) { - BlockDriverState *bs; + BlockDriverState *bs = NULL; int result = 0; - QTAILQ_FOREACH(bs, &bdrv_states, device_list) { + while ((bs = bdrv_next(bs))) { AioContext *aio_context = bdrv_get_aio_context(bs); int ret; -- 2.1.0