| Message ID | 20200805100051.361547-2-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | aio-posix: keep aio_notify_me disabled during polling | expand |
On 8/5/20 12:00 PM, Stefan Hajnoczi wrote: > The event_notifier_*() prefix can be confused with the EventNotifier > APIs that are also called event_notifier_*(). > > Rename the functions to aio_context_notifier_*() to make it clear that > they relate to the AioContext::notifier field. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > util/async.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/util/async.c b/util/async.c > index 1319eee3bc..d9f987e133 100644 > --- a/util/async.c > +++ b/util/async.c > @@ -445,12 +445,12 @@ static void aio_timerlist_notify(void *opaque, QEMUClockType type) > aio_notify(opaque); > } > > -static void event_notifier_dummy_cb(EventNotifier *e) > +static void aio_context_notifier_dummy_cb(EventNotifier *e) > { > } > > /* Returns true if aio_notify() was called (e.g. a BH was scheduled) */ > -static bool event_notifier_poll(void *opaque) > +static bool aio_context_notifier_poll(void *opaque) > { > EventNotifier *e = opaque; > AioContext *ctx = container_of(e, AioContext, notifier); > @@ -508,8 +508,8 @@ AioContext *aio_context_new(Error **errp) > > aio_set_event_notifier(ctx, &ctx->notifier, > false, > - event_notifier_dummy_cb, > - event_notifier_poll); > + aio_context_notifier_dummy_cb, > + aio_context_notifier_poll); > #ifdef CONFIG_LINUX_AIO > ctx->linux_aio = NULL; > #endif >
diff --git a/util/async.c b/util/async.c index 1319eee3bc..d9f987e133 100644 --- a/util/async.c +++ b/util/async.c @@ -445,12 +445,12 @@ static void aio_timerlist_notify(void *opaque, QEMUClockType type) aio_notify(opaque); } -static void event_notifier_dummy_cb(EventNotifier *e) +static void aio_context_notifier_dummy_cb(EventNotifier *e) { } /* Returns true if aio_notify() was called (e.g. a BH was scheduled) */ -static bool event_notifier_poll(void *opaque) +static bool aio_context_notifier_poll(void *opaque) { EventNotifier *e = opaque; AioContext *ctx = container_of(e, AioContext, notifier); @@ -508,8 +508,8 @@ AioContext *aio_context_new(Error **errp) aio_set_event_notifier(ctx, &ctx->notifier, false, - event_notifier_dummy_cb, - event_notifier_poll); + aio_context_notifier_dummy_cb, + aio_context_notifier_poll); #ifdef CONFIG_LINUX_AIO ctx->linux_aio = NULL; #endif
The event_notifier_*() prefix can be confused with the EventNotifier APIs that are also called event_notifier_*(). Rename the functions to aio_context_notifier_*() to make it clear that they relate to the AioContext::notifier field. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- util/async.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)