Message ID | 149095965106.26233.18168802196576430962.stgit@bahia.lan |
---|---|
State | New |
Headers | show |
> -----Original Message----- > From: Greg Kurz [mailto:groug@kaod.org] > Sent: Friday, March 31, 2017 7:28 PM > To: qemu-devel@nongnu.org > Cc: Eric Blake; 李强; Greg Kurz > Subject: [for-2.9 PATCH 3/3] 9pfs: drop useless loop in v9fs_reset() > > We don't need to wait for the PDU active list to be empty: virtfs_reset() already > takes care of that. > > Signed-off-by: Greg Kurz <groug@kaod.org> > --- Reviewed-by: Li Qiang <liqiang6-s@360.cn> > hw/9pfs/9p.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 86ed9065c4e2..16ef6bd5bd8c > 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -3601,6 +3601,7 @@ static void coroutine_fn virtfs_co_reset(void > *opaque) > VirtfsCoResetData *data = opaque; > > virtfs_reset(&data->pdu); > + assert(QLIST_EMPTY(&data->pdu.s->active_list)); > data->done = true; > } > > @@ -3609,10 +3610,6 @@ void v9fs_reset(V9fsState *s) > VirtfsCoResetData data = { .pdu = { .s = s }, .done = false }; > Coroutine *co; > > - while (!QLIST_EMPTY(&s->active_list)) { > - aio_poll(qemu_get_aio_context(), true); > - } > - > co = qemu_coroutine_create(virtfs_co_reset, &data); > qemu_coroutine_enter(co); >
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 86ed9065c4e2..16ef6bd5bd8c 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -3601,6 +3601,7 @@ static void coroutine_fn virtfs_co_reset(void *opaque) VirtfsCoResetData *data = opaque; virtfs_reset(&data->pdu); + assert(QLIST_EMPTY(&data->pdu.s->active_list)); data->done = true; } @@ -3609,10 +3610,6 @@ void v9fs_reset(V9fsState *s) VirtfsCoResetData data = { .pdu = { .s = s }, .done = false }; Coroutine *co; - while (!QLIST_EMPTY(&s->active_list)) { - aio_poll(qemu_get_aio_context(), true); - } - co = qemu_coroutine_create(virtfs_co_reset, &data); qemu_coroutine_enter(co);
We don't need to wait for the PDU active list to be empty: virtfs_reset() already takes care of that. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/9pfs/9p.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)