qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: oleksandr@redhat.com, Kevin Wolf <kwolf@redhat.com>,
	qemu-block@nongnu.org, Julia Suvorova <jusual@mail.ru>,
	Julia Suvorova <jusual@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Max Reitz <mreitz@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>,
	Aarushi Mehta <mehta.aaru20@gmail.com>
Subject: [PATCH 13/16] qemu-nbd: adds option for aio engines
Date: Mon,  7 Oct 2019 13:09:34 +0100	[thread overview]
Message-ID: <20191007120937.5862-14-stefanha@redhat.com> (raw)
In-Reply-To: <20191007120937.5862-1-stefanha@redhat.com>

From: Aarushi Mehta <mehta.aaru20@gmail.com>

Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
Acked-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qemu-nbd.c    | 12 ++++--------
 qemu-nbd.texi |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 9032b6de2a..afa969c785 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -135,7 +135,7 @@ static void usage(const char *name)
 "                            '[ID_OR_NAME]'\n"
 "  -n, --nocache             disable host cache\n"
 "      --cache=MODE          set cache mode (none, writeback, ...)\n"
-"      --aio=MODE            set AIO mode (native or threads)\n"
+"      --aio=MODE            set AIO mode (native, io_uring or threads)\n"
 "      --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"
@@ -719,13 +719,9 @@ int main(int argc, char **argv)
                 exit(EXIT_FAILURE);
             }
             seen_aio = true;
-            if (!strcmp(optarg, "native")) {
-                flags |= BDRV_O_NATIVE_AIO;
-            } else if (!strcmp(optarg, "threads")) {
-                /* this is the default */
-            } else {
-               error_report("invalid aio mode `%s'", optarg);
-               exit(EXIT_FAILURE);
+            if (bdrv_parse_aio(optarg, &flags) < 0) {
+                error_report("Invalid aio mode '%s'", optarg);
+                exit(EXIT_FAILURE);
             }
             break;
         case QEMU_NBD_OPT_DISCARD:
diff --git a/qemu-nbd.texi b/qemu-nbd.texi
index 7f55657722..3ee3e4bdee 100644
--- a/qemu-nbd.texi
+++ b/qemu-nbd.texi
@@ -77,8 +77,8 @@ as an read-only device, @var{snapshot_param} format is
 The cache mode to be used with the file.  See the documentation of
 the emulator's @code{-drive cache=...} option for allowed values.
 @item --aio=@var{aio}
-Set the asynchronous I/O mode between @samp{threads} (the default)
-and @samp{native} (Linux only).
+Set the asynchronous I/O mode between @samp{threads} (the default),
+@samp{native} (Linux only) and @samp{io_uring} (Linux 5.1+).
 @item --discard=@var{discard}
 Control whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap})
 requests are ignored or passed to the filesystem.  @var{discard} is one of
-- 
2.21.0



  parent reply	other threads:[~2019-10-07 12:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-07 12:09 [PATCH 00/16] io_uring: add Linux io_uring AIO engine Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 01/16] configure: permit use of io_uring Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 02/16] qapi/block-core: add option for io_uring Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 03/16] block/block: add BDRV flag " Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 04/16] block/io_uring: implements interfaces " Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 05/16] stubs: add stubs for io_uring interface Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 06/16] util/async: add aio interfaces for io_uring Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 07/16] blockdev: adds bdrv_parse_aio to use io_uring Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 08/16] block/file-posix.c: extend " Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 09/16] block: add trace events for io_uring Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 10/16] block/io_uring: adds userspace completion polling Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 11/16] qemu-io: adds option to use aio engine Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 12/16] qemu-img: adds option to use aio engine for benchmarking Stefan Hajnoczi
2019-10-07 12:09 ` Stefan Hajnoczi [this message]
2019-10-07 12:09 ` [PATCH 14/16] tests/qemu-iotests: enable testing with aio options Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 15/16] tests/qemu-iotests: use AIOMODE with various tests Stefan Hajnoczi
2019-10-07 12:09 ` [PATCH 16/16] block/io_uring: adds fd registration Stefan Hajnoczi

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=20191007120937.5862-14-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=armbru@redhat.com \
    --cc=fam@euphon.net \
    --cc=jusual@mail.ru \
    --cc=jusual@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mehta.aaru20@gmail.com \
    --cc=mreitz@redhat.com \
    --cc=oleksandr@redhat.com \
    --cc=pbonzini@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).