| Message ID | 1374765505-14356-4-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jul 25, 2013 at 05:18:10PM +0200, Stefan Hajnoczi wrote: > 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> > --- > hw/block/dataplane/virtio-blk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c > index 2faed43..8d3e145 100644 > --- a/hw/block/dataplane/virtio-blk.c > +++ b/hw/block/dataplane/virtio-blk.c > @@ -379,9 +379,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; > } > > -- > 1.8.1.4 > > Reviewed-by: Jeff Cody <jcody@redhat.com>
> 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> > --- > hw/block/dataplane/virtio-blk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c > index 2faed43..8d3e145 100644 > --- a/hw/block/dataplane/virtio-blk.c > +++ b/hw/block/dataplane/virtio-blk.c > @@ -379,9 +379,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; > } > It seems more likely a bug fix. Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 2faed43..8d3e145 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -379,9 +379,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; }
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> --- hw/block/dataplane/virtio-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)