From: "Dirk Müller" <dmueller@suse.de>
To: qemu-block@nongnu.org
Cc: eblake@redhat.com, qemu-devel@nongnu.org,
"Dirk Müller" <dmueller@suse.de>
Subject: [PATCH] Only advertise aio=io_uring if support is actually available
Date: Tue, 19 Apr 2022 19:19:31 +0200 [thread overview]
Message-ID: <20220419171931.26192-1-dmueller@suse.de> (raw)
This allows $qemu --help runtime configure checks for detecting
the host support.
Signed-off-by: Dirk Müller <dmueller@suse.de>
---
block/file-posix.c | 4 ++++
qemu-nbd.c | 4 ++++
qemu-options.hx | 6 +++++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 39a3d6dbe6..aec4763862 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -544,7 +544,11 @@ static QemuOptsList raw_runtime_opts = {
{
.name = "aio",
.type = QEMU_OPT_STRING,
+#ifdef CONFIG_LINUX_IO_URING
.help = "host AIO implementation (threads, native, io_uring)",
+#else
+ .help = "host AIO implementation (threads, native)",
+#endif
},
{
.name = "aio-max-batch",
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 713e7557a9..4634a0fc42 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -147,7 +147,11 @@ static void usage(const char *name)
" --cache=MODE set cache mode used to access the disk image, the\n"
" valid options are: 'none', 'writeback' (default),\n"
" 'writethrough', 'directsync' and 'unsafe'\n"
+#ifdef CONFIG_LINUX_IO_URING
" --aio=MODE set AIO mode (native, io_uring or threads)\n"
+#else
+" --aio=MODE set AIO mode (native or threads)\n"
+#endif
" --discard=MODE set discard mode (ignore, unmap)\n"
" --detect-zeroes=MODE set detect-zeroes mode (off, on, unmap)\n"
" --image-opts treat FILE as a full set of image options\n"
diff --git a/qemu-options.hx b/qemu-options.hx
index 34e9b32a5c..973125cfca 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1338,7 +1338,11 @@ DEF("drive", HAS_ARG, QEMU_OPTION_drive,
" [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
" [,snapshot=on|off][,rerror=ignore|stop|report]\n"
" [,werror=ignore|stop|report|enospc][,id=name]\n"
- " [,aio=threads|native|io_uring]\n"
+ " [,aio=threads|native"
+#if defined(CONFIG_LINUX_IO_URING)
+ "|io_uring"
+#endif
+ "]\n"
" [,readonly=on|off][,copy-on-read=on|off]\n"
" [,discard=ignore|unmap][,detect-zeroes=on|off|unmap]\n"
" [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]]\n"
--
2.35.3
next reply other threads:[~2022-04-19 17:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 17:19 Dirk Müller [this message]
2022-04-19 19:23 ` [PATCH] Only advertise aio=io_uring if support is actually available Eric Blake
2022-04-20 8:33 ` Daniel P. Berrangé
2022-04-21 16:51 ` Dirk Müller
2022-04-25 11:06 ` Dirk Müller
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=20220419171931.26192-1-dmueller@suse.de \
--to=dmueller@suse.de \
--cc=eblake@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.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).