mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: rename former bdrv_file_open callbacks

Browse Source 
Since there is no bdrv_file_open callback anymore, rename the implementations
so that they end with "_open" instead of "_file_open".  NFS is the exception
because all the functions are named nfs_file_*.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-09-04 12:07:19 +02:00
parent 44b424dc4a
commit d656aaa136
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blkio.c
View File

@ -713,7 +713,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
* for example will fail. * for example will fail.
* *
* In order to open the device read-only, we are using the `read-only` * In order to open the device read-only, we are using the `read-only`
* property of the libblkio driver in blkio_file_open(). * property of the libblkio driver in blkio_open().
*/ */
fd = qemu_open(path, O_RDWR, NULL); fd = qemu_open(path, O_RDWR, NULL);
if (fd < 0) { if (fd < 0) {
@ -791,8 +791,8 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
return 0; return 0;
} }
static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags, static int blkio_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp) Error **errp)
{ {
const char *blkio_driver = bs->drv->protocol_name; const char *blkio_driver = bs->drv->protocol_name;
BDRVBlkioState *s = bs->opaque; BDRVBlkioState *s = bs->opaque;
@ -1088,7 +1088,7 @@ static void blkio_refresh_limits(BlockDriverState *bs, Error **errp)
*/ */
#define BLKIO_DRIVER_COMMON \ #define BLKIO_DRIVER_COMMON \
.instance_size = sizeof(BDRVBlkioState), \ .instance_size = sizeof(BDRVBlkioState), \
.bdrv_open = blkio_file_open, \ .bdrv_open = blkio_open, \
.bdrv_close = blkio_close, \ .bdrv_close = blkio_close, \
.bdrv_co_getlength = blkio_co_getlength, \ .bdrv_co_getlength = blkio_co_getlength, \
.bdrv_co_truncate = blkio_truncate, \ .bdrv_co_truncate = blkio_truncate, \

8
block/null.c
View File

@ -77,8 +77,8 @@ static void null_aio_parse_filename(const char *filename, QDict *options,
} }
} }
static int null_file_open(BlockDriverState *bs, QDict *options, int flags, static int null_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp) Error **errp)
{ {
QemuOpts *opts; QemuOpts *opts;
BDRVNullState *s = bs->opaque; BDRVNullState *s = bs->opaque;
@ -283,7 +283,7 @@ static BlockDriver bdrv_null_co = {
.protocol_name = "null-co", .protocol_name = "null-co",
.instance_size = sizeof(BDRVNullState), .instance_size = sizeof(BDRVNullState),
.bdrv_open = null_file_open, .bdrv_open = null_open,
.bdrv_parse_filename = null_co_parse_filename, .bdrv_parse_filename = null_co_parse_filename,
.bdrv_co_getlength = null_co_getlength, .bdrv_co_getlength = null_co_getlength,
.bdrv_co_get_allocated_file_size = null_co_get_allocated_file_size, .bdrv_co_get_allocated_file_size = null_co_get_allocated_file_size,
@ -304,7 +304,7 @@ static BlockDriver bdrv_null_aio = {
.protocol_name = "null-aio", .protocol_name = "null-aio",
.instance_size = sizeof(BDRVNullState), .instance_size = sizeof(BDRVNullState),
.bdrv_open = null_file_open, .bdrv_open = null_open,
.bdrv_parse_filename = null_aio_parse_filename, .bdrv_parse_filename = null_aio_parse_filename,
.bdrv_co_getlength = null_co_getlength, .bdrv_co_getlength = null_co_getlength,
.bdrv_co_get_allocated_file_size = null_co_get_allocated_file_size, .bdrv_co_get_allocated_file_size = null_co_get_allocated_file_size,

8
block/nvme.c
View File

@ -889,7 +889,7 @@ out:
qemu_vfio_pci_unmap_bar(s->vfio, 0, (void *)regs, 0, sizeof(NvmeBar)); qemu_vfio_pci_unmap_bar(s->vfio, 0, (void *)regs, 0, sizeof(NvmeBar));
} }
/* Cleaning up is done in nvme_file_open() upon error. */ /* Cleaning up is done in nvme_open() upon error. */
return ret; return ret;
} }
@ -967,8 +967,8 @@ static void nvme_close(BlockDriverState *bs)
g_free(s->device); g_free(s->device);
} }
static int nvme_file_open(BlockDriverState *bs, QDict *options, int flags, static int nvme_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp) Error **errp)
{ {
const char *device; const char *device;
QemuOpts *opts; QemuOpts *opts;
@ -1630,7 +1630,7 @@ static BlockDriver bdrv_nvme = {
.create_opts = &bdrv_create_opts_simple, .create_opts = &bdrv_create_opts_simple,
.bdrv_parse_filename = nvme_parse_filename, .bdrv_parse_filename = nvme_parse_filename,
.bdrv_open = nvme_file_open, .bdrv_open = nvme_open,
.bdrv_close = nvme_close, .bdrv_close = nvme_close,
.bdrv_co_getlength = nvme_co_getlength, .bdrv_co_getlength = nvme_co_getlength,
.bdrv_probe_blocksizes = nvme_probe_blocksizes, .bdrv_probe_blocksizes = nvme_probe_blocksizes,

6
block/ssh.c
View File

@ -837,8 +837,8 @@ static int connect_to_ssh(BDRVSSHState *s, BlockdevOptionsSsh *opts,
return ret; return ret;
} }
static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags, static int ssh_open(BlockDriverState *bs, QDict *options, int bdrv_flags,
Error **errp) Error **errp)
{ {
BDRVSSHState *s = bs->opaque; BDRVSSHState *s = bs->opaque;
BlockdevOptionsSsh *opts; BlockdevOptionsSsh *opts;
@ -1362,7 +1362,7 @@ static BlockDriver bdrv_ssh = {
.protocol_name = "ssh", .protocol_name = "ssh",
.instance_size = sizeof(BDRVSSHState), .instance_size = sizeof(BDRVSSHState),
.bdrv_parse_filename = ssh_parse_filename, .bdrv_parse_filename = ssh_parse_filename,
.bdrv_open = ssh_file_open, .bdrv_open = ssh_open,
.bdrv_co_create = ssh_co_create, .bdrv_co_create = ssh_co_create,
.bdrv_co_create_opts = ssh_co_create_opts, .bdrv_co_create_opts = ssh_co_create_opts,
.bdrv_close = ssh_close, .bdrv_close = ssh_close,