diff --git a/include/block/aio.h b/include/block/aio.h index f08b3580778da8bebb6265985cc7fc4eceecf33e..520ceaa7007e6aef13e289daad068fef2fbdbde9 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -694,9 +694,6 @@ void aio_context_setup(AioContext *ctx); */ void aio_context_destroy(AioContext *ctx); -/* Used internally, do not call outside AioContext code */ -void aio_context_use_g_source(AioContext *ctx); - /** * aio_context_set_poll_params: * @ctx: the aio context diff --git a/util/aio-posix.c b/util/aio-posix.c index 7f2c99729d4475640b7c6b21977123a8e6f97bae..d68dffcf0b67437909a7fd12596d4701d9e9d330 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -751,18 +751,6 @@ void aio_context_destroy(AioContext *ctx) aio_free_deleted_handlers(ctx); } -void aio_context_use_g_source(AioContext *ctx) -{ - /* - * Disable io_uring when the glib main loop is used because it doesn't - * support mixed glib/aio_poll() usage. It relies on aio_poll() being - * called regularly so that changes to the monitored file descriptors are - * submitted, otherwise a list of pending fd handlers builds up. - */ - fdmon_io_uring_destroy(ctx); - aio_free_deleted_handlers(ctx); -} - void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **errp) { diff --git a/util/aio-win32.c b/util/aio-win32.c index 948ef47a4d3e01a940c7701ba2f51dcf6bfc83c4..1014e7a902f1ec206018ae98799b477fb37a0794 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -426,10 +426,6 @@ void aio_context_destroy(AioContext *ctx) { } -void aio_context_use_g_source(AioContext *ctx) -{ -} - void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **errp) { diff --git a/util/async.c b/util/async.c index 8f90ddc3047a9f0567da47ab6f89b6190e1d0f9d..5a757c8a6e9bb5150f09f56a2ccb47062d0a1afb 100644 --- a/util/async.c +++ b/util/async.c @@ -427,7 +427,6 @@ static GSourceFuncs aio_source_funcs = { GSource *aio_get_g_source(AioContext *ctx) { - aio_context_use_g_source(ctx); g_source_ref(&ctx->source); return &ctx->source; }