From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 11 Apr 2013 15:24:08 +0000 (+0200)
Subject: dataplane/virtio-blk: check exit conditions before aio_poll()
X-Git-Tag: qemu-xen-4.5.0-rc1~527^2~15
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf0da4df83e8af7ec02e3809f3dd30cc0a42e4bc;p=qemu-upstream-4.5-testing.git

dataplane/virtio-blk: check exit conditions before aio_poll()

Check exit conditions before entering blocking aio_poll().  This is
mainly for consistency since it's unlikely that we are stopping in the
first event loop iteration.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 411becc06..5bd5eed98 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -376,9 +376,9 @@ static void *data_plane_thread(void *opaque)
 {
     VirtIOBlockDataPlane *s = opaque;
 
-    do {
+    while (!s->stopping || s->num_reqs > 0) {
         aio_poll(s->ctx, true);
-    } while (!s->stopping || s->num_reqs > 0);
+    }
     return NULL;
 }