motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block/blkio: move blkio_connect() in the drivers functions

Browse source 
This is in preparation for the next patch, where for virtio-blk
drivers we need to handle the failure of blkio_connect().

Let's also rename the *_open() functions to *_connect() to make
the code reflect the changes applied.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20230727161020.84213-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefano Garzarella 2023-07-27 18:10:17 +02:00 • committed by Stefan Hajnoczi
parent ef256751e9
commit 69785d66ae
1 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

67
block/blkio.c
View file

@ -603,8 +603,8 @@ static void blkio_unregister_buf(BlockDriverState *bs, void *host, size_t size)
} }
} }
static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags, static int blkio_io_uring_connect(BlockDriverState *bs, QDict *options,
Error **errp) int flags, Error **errp)
{ {
const char *filename = qdict_get_str(options, "filename"); const char *filename = qdict_get_str(options, "filename");
BDRVBlkioState *s = bs->opaque; BDRVBlkioState *s = bs->opaque;
@ -627,11 +627,18 @@ static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags,
} }
} }
ret = blkio_connect(s->blkio);
if (ret < 0) {
error_setg_errno(errp, -ret, "blkio_connect failed: %s",
blkio_get_error_msg());
return ret;
}
return 0; return 0;
} }
static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags, static int blkio_nvme_io_uring_connect(BlockDriverState *bs, QDict *options,
Error **errp) int flags, Error **errp)
{ {
const char *path = qdict_get_try_str(options, "path"); const char *path = qdict_get_try_str(options, "path");
BDRVBlkioState *s = bs->opaque; BDRVBlkioState *s = bs->opaque;
@ -655,11 +662,18 @@ static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags,
return -EINVAL; return -EINVAL;
} }
ret = blkio_connect(s->blkio);
if (ret < 0) {
error_setg_errno(errp, -ret, "blkio_connect failed: %s",
blkio_get_error_msg());
return ret;
}
return 0; return 0;
} }
static int blkio_virtio_blk_common_open(BlockDriverState *bs, static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
QDict *options, int flags, Error **errp) int flags, Error **errp)
{ {
const char *path = qdict_get_try_str(options, "path"); const char *path = qdict_get_try_str(options, "path");
BDRVBlkioState *s = bs->opaque; BDRVBlkioState *s = bs->opaque;
@ -718,6 +732,13 @@ static int blkio_virtio_blk_common_open(BlockDriverState *bs,
} }
} }
ret = blkio_connect(s->blkio);
if (ret < 0) {
error_setg_errno(errp, -ret, "blkio_connect failed: %s",
blkio_get_error_msg());
return ret;
}
qdict_del(options, "path"); qdict_del(options, "path");
return 0; return 0;
@ -737,24 +758,6 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
return ret; return ret;
} }
if (strcmp(blkio_driver, "io_uring") == 0) {
ret = blkio_io_uring_open(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "nvme-io_uring") == 0) {
ret = blkio_nvme_io_uring(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "virtio-blk-vfio-pci") == 0) {
ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "virtio-blk-vhost-user") == 0) {
ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "virtio-blk-vhost-vdpa") == 0) {
ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
} else {
g_assert_not_reached();
}
if (ret < 0) {
blkio_destroy(&s->blkio);
return ret;
}
if (!(flags & BDRV_O_RDWR)) { if (!(flags & BDRV_O_RDWR)) {
ret = blkio_set_bool(s->blkio, "read-only", true); ret = blkio_set_bool(s->blkio, "read-only", true);
if (ret < 0) { if (ret < 0) {
@ -765,10 +768,20 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
} }
} }
ret = blkio_connect(s->blkio); if (strcmp(blkio_driver, "io_uring") == 0) {
ret = blkio_io_uring_connect(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "nvme-io_uring") == 0) {
ret = blkio_nvme_io_uring_connect(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "virtio-blk-vfio-pci") == 0) {
ret = blkio_virtio_blk_connect(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "virtio-blk-vhost-user") == 0) {
ret = blkio_virtio_blk_connect(bs, options, flags, errp);
} else if (strcmp(blkio_driver, "virtio-blk-vhost-vdpa") == 0) {
ret = blkio_virtio_blk_connect(bs, options, flags, errp);
} else {
g_assert_not_reached();
}
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "blkio_connect failed: %s",
blkio_get_error_msg());
blkio_destroy(&s->blkio); blkio_destroy(&s->blkio);
return ret; return ret;
} }