ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alberto Faria 2022-10-29 00:38:54 +01:00 committed by Stefan Hajnoczi
parent 4c8f4fda05
commit 6c32fc0df9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/blkio.c
View File

@ -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, static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags,
Error **errp) Error **errp)
{ {
const char *filename = qdict_get_str(options, "filename"); const char *path = qdict_get_try_str(options, "path");
BDRVBlkioState *s = bs->opaque; BDRVBlkioState *s = bs->opaque;
int ret; int ret;
ret = blkio_set_str(s->blkio, "path", filename); if (!path) {
qdict_del(options, "filename"); error_setg(errp, "missing 'path' option");
return -EINVAL;
}
ret = blkio_set_str(s->blkio, "path", path);
qdict_del(options, "path");
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "failed to set path: %s", error_setg_errno(errp, -ret, "failed to set path: %s",
blkio_get_error_msg()); blkio_get_error_msg());
@ -1016,7 +1021,6 @@ static BlockDriver bdrv_io_uring = BLKIO_DRIVER(
static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER( static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER(
DRIVER_NVME_IO_URING, DRIVER_NVME_IO_URING,
.bdrv_needs_filename = true,
); );
static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER( static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER(

4
qapi/block-core.json
View File

@ -3704,12 +3704,12 @@
# #
# Driver specific block device options for the nvme-io_uring backend. # Driver specific block device options for the nvme-io_uring backend.
# #
# @filename: path to the image file # @path: path to the image file
# #
# Since: 7.2 # Since: 7.2
## ##
{ 'struct': 'BlockdevOptionsNvmeIoUring', { 'struct': 'BlockdevOptionsNvmeIoUring',
'data': { 'filename': 'str' }, 'data': { 'path': 'str' },
'if': 'CONFIG_BLKIO' } 'if': 'CONFIG_BLKIO' }
## ##