diff options
| author | Alberto Faria | 2022-10-29 01:38:54 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2022-10-31 19:35:14 +0100 |
| commit | 6c32fc0df9cd901add75618c831fb26a9eb742cb (patch) | |
| tree | 1b088c238fac85ab86a7db839ec9b171710fc00c /block | |
| parent | block/blkio: Tolerate device size changes (diff) | |
| download | qemu-6c32fc0df9cd901add75618c831fb26a9eb742cb.tar.gz qemu-6c32fc0df9cd901add75618c831fb26a9eb742cb.tar.xz qemu-6c32fc0df9cd901add75618c831fb26a9eb742cb.zip | |
block/blkio: Make driver nvme-io_uring take a "path" instead of a "filename"
The nvme-io_uring driver expects a character special file such as
/dev/ng0n1. Follow the convention of having a "filename" option when a
regular file is expected, and a "path" option otherwise.
This makes io_uring the only libblkio-based driver with a "filename"
option, as it accepts a regular file (even though it can also take a
block special file).
Signed-off-by: Alberto Faria <afaria@redhat.com>
Message-id: 20221028233854.839933-1-afaria@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blkio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/block/blkio.c b/block/blkio.c index d850506acd..620fab28a7 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -640,12 +640,17 @@ static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags, static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags, Error **errp) { - const char *filename = qdict_get_str(options, "filename"); + const char *path = qdict_get_try_str(options, "path"); BDRVBlkioState *s = bs->opaque; int ret; - ret = blkio_set_str(s->blkio, "path", filename); - qdict_del(options, "filename"); + if (!path) { + error_setg(errp, "missing 'path' option"); + return -EINVAL; + } + + ret = blkio_set_str(s->blkio, "path", path); + qdict_del(options, "path"); if (ret < 0) { error_setg_errno(errp, -ret, "failed to set path: %s", blkio_get_error_msg()); @@ -1016,7 +1021,6 @@ static BlockDriver bdrv_io_uring = BLKIO_DRIVER( static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER( DRIVER_NVME_IO_URING, - .bdrv_needs_filename = true, ); static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER( |