Commit 7680274d authored by Aarushi Mehta's avatar Aarushi Mehta Committed by Stefan Hajnoczi
Browse files

qemu-nbd: adds option for aio engines 



Signed-off-by: default avatarAarushi Mehta <mehta.aaru20@gmail.com>
Acked-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200120141858.587874-14-stefanha@redhat.com
Message-Id: <20200120141858.587874-14-stefanha@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent cdd26774

docs/interop/qemu-nbd.rst

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ driver options if ``--image-opts`` is specified. 


.. option:: --aio=AIO



  Set the asynchronous I/O mode between ``threads`` (the default)

  and ``native`` (Linux only).

  Set the asynchronous I/O mode between ``threads`` (the default),

  ``native`` (Linux only), and ``io_uring`` (Linux 5.1+).



.. option:: --discard=DISCARD

qemu-nbd.c

+4 −8
Original line number Diff line number Diff line
@@ -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"
@@ -726,12 +726,8 @@ 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);

            if (bdrv_parse_aio(optarg, &flags) < 0) {

                error_report("Invalid aio mode '%s'", optarg);

                exit(EXIT_FAILURE);

            }

            break;