diff options
| author | Aarushi Mehta <mehta.aaru20@gmail.com> | 2020-01-20 14:18:50 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2020-01-30 20:59:41 +0000 |
| commit | f80f267373fd3170584da9d229ac07d4f26b7e16 (patch) | |
| tree | 8961d4c96aa8970f1c2af50bf4320072d03221d1 | |
| parent | fcb7a4a4e8ae8938e86a669dd9c276ee98aa4203 (diff) | |
| download | focaccia-qemu-f80f267373fd3170584da9d229ac07d4f26b7e16.tar.gz focaccia-qemu-f80f267373fd3170584da9d229ac07d4f26b7e16.zip | |
blockdev: adds bdrv_parse_aio to use io_uring
Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com> Acked-by: Stefano Garzarella <sgarzare@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 20200120141858.587874-8-stefanha@redhat.com Message-Id: <20200120141858.587874-8-stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | block.c | 22 | ||||
| -rw-r--r-- | blockdev.c | 12 | ||||
| -rw-r--r-- | include/block/block.h | 1 |
3 files changed, 27 insertions, 8 deletions
diff --git a/block.c b/block.c index ecd09dbbfd..6c2b2bd2e2 100644 --- a/block.c +++ b/block.c @@ -846,6 +846,28 @@ static BlockdevDetectZeroesOptions bdrv_parse_detect_zeroes(QemuOpts *opts, } /** + * Set open flags for aio engine + * + * Return 0 on success, -1 if the engine specified is invalid + */ +int bdrv_parse_aio(const char *mode, int *flags) +{ + if (!strcmp(mode, "threads")) { + /* do nothing, default */ + } else if (!strcmp(mode, "native")) { + *flags |= BDRV_O_NATIVE_AIO; +#ifdef CONFIG_LINUX_IO_URING + } else if (!strcmp(mode, "io_uring")) { + *flags |= BDRV_O_IO_URING; +#endif + } else { + return -1; + } + + return 0; +} + +/** * Set open flags for a given discard mode * * Return 0 on success, -1 if the discard mode was invalid. diff --git a/blockdev.c b/blockdev.c index 4cd9a58d36..c6a727cca9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -385,13 +385,9 @@ static void extract_common_blockdev_options(QemuOpts *opts, int *bdrv_flags, } if ((aio = qemu_opt_get(opts, "aio")) != NULL) { - if (!strcmp(aio, "native")) { - *bdrv_flags |= BDRV_O_NATIVE_AIO; - } else if (!strcmp(aio, "threads")) { - /* this is the default */ - } else { - error_setg(errp, "invalid aio option"); - return; + if (bdrv_parse_aio(aio, bdrv_flags) < 0) { + error_setg(errp, "invalid aio option"); + return; } } } @@ -4672,7 +4668,7 @@ QemuOptsList qemu_common_drive_opts = { },{ .name = "aio", .type = QEMU_OPT_STRING, - .help = "host AIO implementation (threads, native)", + .help = "host AIO implementation (threads, native, io_uring)", },{ .name = BDRV_OPT_CACHE_WB, .type = QEMU_OPT_BOOL, diff --git a/include/block/block.h b/include/block/block.h index 19184d5850..6cd566324d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -289,6 +289,7 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to, Error **errp); +int bdrv_parse_aio(const char *mode, int *flags); int bdrv_parse_cache_mode(const char *mode, int *flags, bool *writethrough); int bdrv_parse_discard_flags(const char *mode, int *flags); BdrvChild *bdrv_open_child(const char *filename, |