aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-04-28 14:27:49 +0100
committerKevin Wolf <kwolf@redhat.com>2015-04-28 15:36:17 +0200
commit4f5472cb2d3d37ec3282cc3829612f9d696c2df7 (patch)
tree9c20acb95e44dd9859dae9311a756f400171cd4e
parent7237aecd7e8fcc3ccf7fded77b6c127b4df5d3ac (diff)
downloadqemu-4f5472cb2d3d37ec3282cc3829612f9d696c2df7.zip
qemu-4f5472cb2d3d37ec3282cc3829612f9d696c2df7.tar.gz
qemu-4f5472cb2d3d37ec3282cc3829612f9d696c2df7.tar.bz2
block: replace bdrv_states iteration with bdrv_next()
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. Reviewed-by: Alberto Garcia <berto@igalia.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block.c14
1 files 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;