Skip to content

Commit

Permalink
iothread: Remove unused Error** argument in aio_context_set_aio_params
Browse files Browse the repository at this point in the history
aio_context_set_aio_params() doesn't use its undocumented
Error** argument. Remove it to simplify.

Note this removes a use of "unchecked Error**" in
iothread_set_aio_context_params().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20231120171806.19361-1-philmd@linaro.org>
  • Loading branch information
philmd authored and stefanhaRH committed Jan 8, 2024
1 parent ffd454c commit 897a06c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 12 deletions.
3 changes: 1 addition & 2 deletions include/block/aio.h
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,7 @@ void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
* @max_batch: maximum number of requests in a batch, 0 means that the
* engine will use its default
*/
void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch,
Error **errp);
void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch);

/**
* aio_context_set_thread_pool_params:
Expand Down
3 changes: 1 addition & 2 deletions iothread.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@ static void iothread_set_aio_context_params(EventLoopBase *base, Error **errp)
}

aio_context_set_aio_params(iothread->ctx,
iothread->parent_obj.aio_max_batch,
errp);
iothread->parent_obj.aio_max_batch);

aio_context_set_thread_pool_params(iothread->ctx, base->thread_pool_min,
base->thread_pool_max, errp);
Expand Down
3 changes: 1 addition & 2 deletions util/aio-posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,7 @@ void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
aio_notify(ctx);
}

void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch,
Error **errp)
void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch)
{
/*
* No thread synchronization here, it doesn't matter if an incorrect value
Expand Down
3 changes: 1 addition & 2 deletions util/aio-win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@ void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
}
}

void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch,
Error **errp)
void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch)
{
}
5 changes: 1 addition & 4 deletions util/main-loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,7 @@ static void main_loop_update_params(EventLoopBase *base, Error **errp)
return;
}

aio_context_set_aio_params(qemu_aio_context, base->aio_max_batch, errp);
if (*errp) {
return;
}
aio_context_set_aio_params(qemu_aio_context, base->aio_max_batch);

aio_context_set_thread_pool_params(qemu_aio_context, base->thread_pool_min,
base->thread_pool_max, errp);
Expand Down

0 comments on commit 897a06c

Please sign in to comment.