From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org
Subject: [PULL v2 05/28] tests/unit: skip test-nested-aio-poll with io_uring
Date: Tue, 11 Nov 2025 22:32:15 +0100 [thread overview]
Message-ID: <20251111213238.181992-6-kwolf@redhat.com> (raw)
In-Reply-To: <20251111213238.181992-1-kwolf@redhat.com>
From: Stefan Hajnoczi <stefanha@redhat.com>
test-nested-aio-poll relies on internal details of how fdmon-poll.c
handles AioContext polling. Skip it when other fdmon implementations are
in use.
The reason why fdmon-io_uring.c behaves differently from fdmon-poll.c is
that its fdmon_ops->need_wait() function returns true when
io_uring_enter(2) must be called (e.g. to submit pending SQEs).
AioContext polling is skipped when ->need_wait() returns true, so the
test case will never enter AioContext polling mode with
fdmon-io_uring.c.
Restrict this test to fdmon-poll.c and drop the
aio_context_use_g_source() call since it's no longer necessary.
Note that this test is only built on POSIX systems so it is safe to
include "util/aio-posix.h".
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-ID: <20251104022933.618123-6-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/unit/test-nested-aio-poll.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c
index d8fd92c43b..d13ecccd8c 100644
--- a/tests/unit/test-nested-aio-poll.c
+++ b/tests/unit/test-nested-aio-poll.c
@@ -15,6 +15,7 @@
#include "qemu/osdep.h"
#include "block/aio.h"
#include "qapi/error.h"
+#include "util/aio-posix.h"
typedef struct {
AioContext *ctx;
@@ -71,17 +72,17 @@ static void test(void)
.ctx = aio_context_new(&error_abort),
};
+ if (td.ctx->fdmon_ops != &fdmon_poll_ops) {
+ /* This test is tied to fdmon-poll.c */
+ g_test_skip("fdmon_poll_ops not in use");
+ return;
+ }
+
qemu_set_current_aio_context(td.ctx);
/* Enable polling */
aio_context_set_poll_params(td.ctx, 1000000, 2, 2, &error_abort);
- /*
- * The GSource is unused but this has the side-effect of changing the fdmon
- * that AioContext uses.
- */
- aio_get_g_source(td.ctx);
-
/* Make the event notifier active (set) right away */
event_notifier_init(&td.poll_notifier, 1);
aio_set_event_notifier(td.ctx, &td.poll_notifier,
--
2.51.1
next prev parent reply other threads:[~2025-11-11 21:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-11 21:32 [PULL v2 00/28] Block layer patches Kevin Wolf
2025-11-11 21:32 ` [PULL v2 01/28] aio-posix: fix race between io_uring CQE and AioHandler deletion Kevin Wolf
2025-11-11 21:32 ` [PULL v2 02/28] aio-posix: fix fdmon-io_uring.c timeout stack variable lifetime Kevin Wolf
2025-11-11 21:32 ` [PULL v2 03/28] aio-posix: fix spurious return from ->wait() due to signals Kevin Wolf
2025-11-11 21:32 ` [PULL v2 04/28] aio-posix: keep polling enabled with fdmon-io_uring.c Kevin Wolf
2025-11-11 21:32 ` Kevin Wolf [this message]
2025-11-11 21:32 ` [PULL v2 06/28] aio-posix: integrate fdmon into glib event loop Kevin Wolf
2025-11-11 21:32 ` [PULL v2 07/28] aio: remove aio_context_use_g_source() Kevin Wolf
2025-11-11 21:32 ` [PULL v2 08/28] aio: free AioContext when aio_context_new() fails Kevin Wolf
2025-11-11 21:32 ` [PULL v2 09/28] aio: add errp argument to aio_context_setup() Kevin Wolf
2025-11-11 21:32 ` [PULL v2 10/28] aio-posix: gracefully handle io_uring_queue_init() failure Kevin Wolf
2025-11-11 21:32 ` [PULL v2 11/28] aio-posix: unindent fdmon_io_uring_destroy() Kevin Wolf
2025-11-11 21:32 ` [PULL v2 12/28] aio-posix: add fdmon_ops->dispatch() Kevin Wolf
2025-11-11 21:32 ` [PULL v2 13/28] aio-posix: add aio_add_sqe() API for user-defined io_uring requests Kevin Wolf
2025-11-11 21:32 ` [PULL v2 14/28] block/io_uring: use aio_add_sqe() Kevin Wolf
2025-11-11 21:32 ` [PULL v2 15/28] block/io_uring: use non-vectored read/write when possible Kevin Wolf
2025-11-11 21:32 ` [PULL v2 16/28] block: replace TABs with space Kevin Wolf
2025-11-11 21:32 ` [PULL v2 17/28] block: Drop detach_subchain for bdrv_replace_node Kevin Wolf
2025-11-11 21:32 ` [PULL v2 18/28] iotests: Test resizing file node under raw with size/offset Kevin Wolf
2025-11-11 21:32 ` [PULL v2 19/28] qemu-img: Fix amend option parse error handling Kevin Wolf
2025-11-11 21:32 ` [PULL v2 20/28] iotests: Run iotests with sanitizers Kevin Wolf
2025-11-11 21:32 ` [PULL v2 21/28] qcow2: rename update_refcount_discard to queue_discard Kevin Wolf
2025-11-11 21:32 ` [PULL v2 22/28] qcow2: put discards in discard queue when discard-no-unref is enabled Kevin Wolf
2025-11-11 21:32 ` [PULL v2 23/28] tests/qemu-iotests/184: Fix skip message for qemu-img without throttle Kevin Wolf
2025-11-11 21:32 ` [PULL v2 24/28] tests/qemu-iotests: Improve the dry run list to speed up thorough testing Kevin Wolf
2025-11-11 21:32 ` [PULL v2 25/28] tests/qemu-iotest: Add more image formats to the " Kevin Wolf
2025-11-11 21:32 ` [PULL v2 26/28] block: Allow drivers to control protocol prefix at creation Kevin Wolf
2025-11-11 21:32 ` [PULL v2 27/28] qcow2, vmdk: Restrict creation with secondary file using protocol Kevin Wolf
2025-11-11 21:32 ` [PULL v2 28/28] qemu-img rebase: don't exceed IO_BUF_SIZE in one operation Kevin Wolf
2025-11-12 16:40 ` Thomas Huth
2025-11-12 16:42 ` Thomas Huth
2025-11-12 15:08 ` [PULL v2 00/28] Block layer patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251111213238.181992-6-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).