Fix the generic image creation code
cover Fix the generic image creation code
The recent patches from Max Reitz allowed some block drivers to not provide the .bdrv_co_create_opts and still allow qemu-img to create/format images as long as the image is already existing (that is the case with various block storage drivers like nbd/iscsi/nvme, etc)
However it was found out that some places in the code depend on the .bdrv_co_create_opts/.create_opts to be != NULL to decide if to allow image creation.
To avoid adding failback code to all these places, just make generic failback code be used by the drivers that need it, so that for outside user, there is no diffirence if failback was used or not.
Best regards,
Maxim Levitsky
Maxim Levitsky (2):
block: pass BlockDriver reference to the .bdrv_co_create
block: trickle down the fallback image creation function use to the
block drivers
block.c | 38 ++++++++++++++++++++++---------------- block/crypto.c | 3 ++- block/file-posix.c | 11 +++++++++-- block/file-win32.c | 4 +++- block/gluster.c | 3 ++- block/iscsi.c | 16 ++++------------ block/nbd.c | 6 ++++++ block/nfs.c | 4 +++- block/nvme.c | 3 +++ block/parallels.c | 3 ++- block/qcow.c | 3 ++- block/qcow2.c | 4 +++- block/qed.c | 3 ++- block/raw-format.c | 4 +++- block/rbd.c | 3 ++- block/sheepdog.c | 4 +++- block/ssh.c | 4 +++- block/vdi.c | 4 +++- block/vhdx.c | 3 ++- block/vmdk.c | 4 +++- block/vpc.c | 6 ++++-- include/block/block.h | 7 +++++++ include/block/block_int.h | 3 ++- 23 files changed, 95 insertions(+), 48 deletions(-)
Signature · 1 line
2.17.2
PATCH 1/2 block: pass BlockDriver reference to the .bdrv_co_create
This will allow to reuse a single generic .bdrv_co_create implementation for several drivers.
No functional changes.
--- block.c | 3 ++- block/crypto.c | 3 ++- block/file-posix.c | 4 +++- block/file-win32.c | 4 +++- block/gluster.c | 3 ++- block/nfs.c | 4 +++- block/parallels.c | 3 ++- block/qcow.c | 3 ++- block/qcow2.c | 4 +++- block/qed.c | 3 ++- block/raw-format.c | 4 +++- block/rbd.c | 3 ++- block/sheepdog.c | 4 +++- block/ssh.c | 4 +++- block/vdi.c | 4 +++- block/vhdx.c | 3 ++- block/vmdk.c | 4 +++- block/vpc.c | 6 ++++-- include/block/block_int.h | 3 ++- 19 files changed, 49 insertions(+), 20 deletions(-)
block.c +2 -1
@@ -483,7 +483,8 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque)CreateCo *cco = opaque;assert (cco->drv); - ret = cco->drv->bdrv_co_create_opts (cco->filename, cco->opts, &local_err); + ret = cco->drv->bdrv_co_create_opts (cco->drv, + cco->filename, cco->opts, &local_err);error_propagate (&cco->err, local_err); cco->ret = ret; }
block/crypto.c +2 -1
@@ -601,7 +601,8 @@ fail:return ret; } -static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename, +static int coroutine_fn block_crypto_co_create_opts_luks(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {
block/file-posix.c +3 -1
@@ -2405,7 +2405,9 @@ out:return result; } -static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn raw_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {BlockdevCreateOptions options;
block/file-win32.c +3 -1
@@ -588,7 +588,9 @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)return 0 ; } -static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn raw_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {BlockdevCreateOptions options;
block/gluster.c +2 -1
@@ -1130,7 +1130,8 @@ out:return ret; } -static int coroutine_fn qemu_gluster_co_create_opts(const char *filename, +static int coroutine_fn qemu_gluster_co_create_opts(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {
block/nfs.c +3 -1
@@ -662,7 +662,9 @@ out:return ret; } -static int coroutine_fn nfs_file_co_create_opts(const char *url, QemuOpts *opts, +static int coroutine_fn nfs_file_co_create_opts(BlockDriver *drv, +const char *url, +QemuOpts *opts,Error **errp) {BlockdevCreateOptions *create_options;
block/parallels.c +2 -1
@@ -609,7 +609,8 @@ exit: goto out; } -static int coroutine_fn parallels_co_create_opts(const char *filename, +static int coroutine_fn parallels_co_create_opts(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {
block/qcow.c +2 -1
@@ -934,7 +934,8 @@ exit:return ret; } -static int coroutine_fn qcow_co_create_opts(const char *filename, +static int coroutine_fn qcow_co_create_opts(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {BlockdevCreateOptions *create_options =NULL ;
block/qcow2.c +3 -1
@@ -3558,7 +3558,9 @@ out:return ret; } -static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {BlockdevCreateOptions *create_options =NULL ;
block/qed.c +2 -1
@@ -720,7 +720,8 @@ out:return ret; } -static int coroutine_fn bdrv_qed_co_create_opts(const char *filename, +static int coroutine_fn bdrv_qed_co_create_opts(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {
block/raw-format.c +3 -1
@@ -419,7 +419,9 @@ static int raw_has_zero_init_truncate(BlockDriverState *bs)return bdrv_has_zero_init_truncate (bs->file->bs); } -static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn raw_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {return bdrv_create_file (filename, opts, errp);
block/rbd.c +2 -1
@@ -437,7 +437,8 @@ static int qemu_rbd_co_create(BlockdevCreateOptions *options, Error **errp)return qemu_rbd_do_create (options,NULL ,NULL , errp); } -static int coroutine_fn qemu_rbd_co_create_opts(const char *filename, +static int coroutine_fn qemu_rbd_co_create_opts(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {
block/sheepdog.c +3 -1
@@ -2157,7 +2157,9 @@ out:return ret; } -static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn sd_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {BlockdevCreateOptions *create_options =NULL ;
block/ssh.c +3 -1
@@ -963,7 +963,9 @@ fail:return ret; } -static int coroutine_fn ssh_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn ssh_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {BlockdevCreateOptions *create_options;
block/vdi.c +3 -1
@@ -896,7 +896,9 @@ static int coroutine_fn vdi_co_create(BlockdevCreateOptions *create_options,return vdi_co_do_create (create_options,DEFAULT_CLUSTER_SIZE , errp); } -static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn vdi_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {QDict *qdict =NULL ;
block/vhdx.c +2 -1
@@ -2046,7 +2046,8 @@ delete_and_exit:return ret; } -static int coroutine_fn vhdx_co_create_opts(const char *filename, +static int coroutine_fn vhdx_co_create_opts(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp) {
block/vmdk.c +3 -1
@@ -2588,7 +2588,9 @@ exit:return blk; } -static int coroutine_fn vmdk_co_create_opts(const char *filename, QemuOpts *opts, +static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts,Error **errp) {Error *local_err =NULL ;
block/vpc.c +4 -2
@@ -1089,8 +1089,10 @@ out:return ret; } -static int coroutine_fn vpc_co_create_opts(const char *filename, -QemuOpts *opts,Error **errp) +static int coroutine_fn vpc_co_create_opts(BlockDriver *drv, +const char *filename, +QemuOpts *opts, +Error **errp) {BlockdevCreateOptions *create_options =NULL ;QDict *qdict;
include/block/block_int.h +2 -1
@@ -135,7 +135,8 @@ struct BlockDriver {void (*bdrv_close)(BlockDriverState *bs); int coroutine_fn (*bdrv_co_create)(BlockdevCreateOptions *opts,Error **errp); - int coroutine_fn (*bdrv_co_create_opts)(const char *filename, + int coroutine_fn (*bdrv_co_create_opts)(BlockDriver *drv, +const char *filename,QemuOpts *opts,Error **errp);int (*bdrv_make_empty)(BlockDriverState *bs);
Signature · 1 line
2.17.2
Re: [PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create
Quoted 1 line · Maxim Levitsky
This will allow to reuse a single generic .bdrv_co_create
"allow to ${verb}" is not idiomatic, better is "allow ${subject} to ${verb}" or "allow ${verb}ing". In this case, I'd go with:
This will allow the reuse of a single...
Quoted 5 lines
implementation for several drivers.
No functional changes.Signed-off-by Maxim Levitsky <[email protected]>---
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create
Quoted 7 lines · Eric Blake
Quoted 1 line · Maxim Levitsky
This will allow to reuse a single generic .bdrv_co_create
"allow to ${verb}" is not idiomatic, better is "allow ${subject} to ${verb}" or "allow ${verb}ing". In this case, I'd go with:
This will allow the reuse of a single...
I agree! This commit will probably go as is but next time I'll keep it in mind!
Best regards,
Maxim Levitsky
Quoted 6 lines
Quoted 6 lines
implementation for several drivers.
No functional changes.Signed-off-by Maxim Levitsky <[email protected]>---
Re: [PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create
Quoted 9 lines · Maxim Levitsky
Quoted 7 lines · Eric Blake
Quoted 1 line · Maxim Levitsky
This will allow to reuse a single generic .bdrv_co_create
"allow to ${verb}" is not idiomatic, better is "allow ${subject} to ${verb}" or "allow ${verb}ing". In this case, I'd go with:
This will allow the reuse of a single...
I agree! This commit will probably go as is but next time I'll keep it in mind!
Max hasn't sent the pull request yet; there's still time for him to amend his staging queue if he wants. But yeah, it's not a huge deal if the patch goes in without spelling/grammar polish.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH 2/2 block: trickle down the fallback image creation function use to the block drivers
In reply to Maxim LevitskyInstead of checking the .bdrv_co_create_opts to see if we need the failback, just implement the .bdrv_co_create_opts in the drivers that need it.
This way we don't break various places that need to know if the underlying protocol/format really supports image creation, and this way we still allow some drivers to not support image creation.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816007
Note that technically this driver reverts the image creation failback for the vxhs driver since I don't have a means to test it, and IMHO it is better to leave it not supported as it was prior to generic image creation patches.
Also drop iscsi_create_opts which was left accidently
--- block.c | 35 ++++++++++++++++++++--------------- block/file-posix.c | 7 ++++++- block/iscsi.c | 16 ++++------------ block/nbd.c | 6 ++++++ block/nvme.c | 3 +++ include/block/block.h | 7 +++++++ 6 files changed, 46 insertions(+), 28 deletions(-)
block.c +20 -15
@@ -598,8 +598,15 @@ static int create_file_fallback_zero_first_sector(BlockBackend *blk,return 0 ; } -static int bdrv_create_file_fallback (const char *filename,BlockDriver *drv, -QemuOpts *opts,Error **errp) +/** +* Simple implementation of bdrv_co_create_opts for protocol drivers +* which only support creation via opening a file +* (usually existing raw storage device) +*/ +int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv, +const char *filename, +QemuOpts *opts, +Error **errp) {BlockBackend *blk;QDict *options;
@@ -663,11 +670,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp)return -ENOENT ; } -if (drv->bdrv_co_create_opts) { -return bdrv_create (drv, filename, opts, errp); - }else { -return bdrv_create_file_fallback (filename, drv, opts, errp); - } +return bdrv_create (drv, filename, opts, errp); } int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp)
@@ -1592,9 +1595,9 @@ QemuOptsList bdrv_runtime_opts = { }, }; -static QemuOptsList fallback_create_opts = { - .name ="fallback-create-opts" , - .head =QTAILQ_HEAD_INITIALIZER (fallback_create_opts.head), +QemuOptsList bdrv_create_opts_simple = { + .name ="simple-create-opts" , + .head =QTAILQ_HEAD_INITIALIZER (bdrv_create_opts_simple.head), .desc = { { .name =BLOCK_OPT_SIZE ,
@@ -5963,13 +5966,15 @@ void bdrv_img_create(const char *filename, const char *fmt,return ; } +if (!proto_drv->create_opts) { +error_setg (errp,"Protocol driver '%s' does not support image creation" , + proto_drv->format_name); +return ; + } +/* Create parameter list */ create_opts =qemu_opts_append (create_opts, drv->create_opts); -if (proto_drv->create_opts) { - create_opts =qemu_opts_append (create_opts, proto_drv->create_opts); - }else { - create_opts =qemu_opts_append (create_opts, &fallback_create_opts); - } + create_opts =qemu_opts_append (create_opts, proto_drv->create_opts); opts =qemu_opts_create (create_opts,NULL ,0 , &error_abort);
block/file-posix.c +6 -1
@@ -3513,6 +3513,8 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .mutable_opts = mutable_opts, .bdrv_co_invalidate_cache = raw_co_invalidate_cache, .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
@@ -3639,10 +3641,11 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .mutable_opts = mutable_opts, .bdrv_co_invalidate_cache = raw_co_invalidate_cache, - .bdrv_co_preadv = raw_co_preadv, .bdrv_co_pwritev = raw_co_pwritev, .bdrv_co_flush_to_disk = raw_co_flush_to_disk,
@@ -3771,6 +3774,8 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .mutable_opts = mutable_opts, .bdrv_co_preadv = raw_co_preadv,
block/iscsi.c +4 -12
@@ -2399,18 +2399,6 @@ out_unlock:return r; } -static QemuOptsList iscsi_create_opts = { - .name ="iscsi-create-opts" , - .head =QTAILQ_HEAD_INITIALIZER (iscsi_create_opts.head), - .desc = { - { - .name =BLOCK_OPT_SIZE , - .type =QEMU_OPT_SIZE , - .help ="Virtual disk size" - }, - {/* end of list */ } - } -};static const char *const iscsi_strong_runtime_opts[] = {"transport" ,
@@ -2434,6 +2422,8 @@ static BlockDriver bdrv_iscsi = { .bdrv_parse_filename = iscsi_parse_filename, .bdrv_file_open = iscsi_open, .bdrv_close = iscsi_close, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_reopen_commit = iscsi_reopen_commit, .bdrv_co_invalidate_cache = iscsi_co_invalidate_cache,
@@ -2471,6 +2461,8 @@ static BlockDriver bdrv_iser = { .bdrv_parse_filename = iscsi_parse_filename, .bdrv_file_open = iscsi_open, .bdrv_close = iscsi_close, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_reopen_commit = iscsi_reopen_commit, .bdrv_co_invalidate_cache = iscsi_co_invalidate_cache,
block/nbd.c +6 -0
@@ -2038,6 +2038,8 @@ static BlockDriver bdrv_nbd = { .protocol_name = "nbd", .instance_size = sizeof(BDRVNBDState), .bdrv_parse_filename = nbd_parse_filename, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .bdrv_file_open = nbd_open, .bdrv_reopen_prepare = nbd_client_reopen_prepare, .bdrv_co_preadv = nbd_client_co_preadv,
@@ -2063,6 +2065,8 @@ static BlockDriver bdrv_nbd_tcp = { .protocol_name = "nbd+tcp", .instance_size = sizeof(BDRVNBDState), .bdrv_parse_filename = nbd_parse_filename, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .bdrv_file_open = nbd_open, .bdrv_reopen_prepare = nbd_client_reopen_prepare, .bdrv_co_preadv = nbd_client_co_preadv,
@@ -2088,6 +2092,8 @@ static BlockDriver bdrv_nbd_unix = { .protocol_name = "nbd+unix", .instance_size = sizeof(BDRVNBDState), .bdrv_parse_filename = nbd_parse_filename, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .bdrv_file_open = nbd_open, .bdrv_reopen_prepare = nbd_client_reopen_prepare, .bdrv_co_preadv = nbd_client_co_preadv,
block/nvme.c +3 -0
@@ -1333,6 +1333,9 @@ static BlockDriver bdrv_nvme = { .protocol_name = "nvme", .instance_size = sizeof(BDRVNVMeState), + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, + .bdrv_parse_filename = nvme_parse_filename, .bdrv_file_open = nvme_file_open, .bdrv_close = nvme_close,
include/block/block.h +7 -0
@@ -283,6 +283,13 @@ BlockDriver *bdrv_find_format(const char *format_name);int bdrv_create (BlockDriver *drv,const char * filename,QemuOpts *opts,Error **errp);int bdrv_create_file (const char *filename,QemuOpts *opts,Error **errp); + +int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv, +const char *filename, +QemuOpts *opts, +Error **errp); +extern QemuOptsList bdrv_create_opts_simple; +BlockDriverState *bdrv_new (void );void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top,Error **errp);
Signature · 1 line
2.17.2
Re: [PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
Quoted 9 lines · Maxim Levitsky
Instead of checking the .bdrv_co_create_opts to see if we need the failback, just implement the .bdrv_co_create_opts in the drivers that need it.
This way we don't break various places that need to know if the underlying protocol/format really supports image creation, and this way we still allow some drivers to not support image creation.
Fixes fd17146cd93d1704cd96d7c2757b325fc7aac6fdBugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816007
Thanks, the series looks good to me, just some thoughts below.
Quoted 4 lines
Note that technically this driver reverts the image creation failback for the vxhs driver since I don't have a means to test it, and IMHO it is better to leave it not supported as it was prior to generic image creation patches.
There’s also file-win32. I don’t really have the means to test that either, though, so I suppose it’s reasonable to wait until someone requests it. OTOH, it shouldn’t be different from file-posix, so maybe it wouldn’t hurt to support it, too.
We could also take this series for 5.0 as-is, and queue a file-win32 patch for 5.1.
What do you think?
Quoted 21 lines
Also drop
iscsi_create_optswhich was left accidentlySigned-off-by Maxim Levitsky <[email protected]>--- block.c | 35 ++++++++++++++++++++--------------- block/file-posix.c | 7 ++++++- block/iscsi.c | 16 ++++------------ block/nbd.c | 6 ++++++ block/nvme.c | 3 +++ include/block/block.h | 7 +++++++ 6 files changed, 46 insertions(+), 28 deletions(-)block.c +0
-1@@ -598,8 +598,15 @@ static int create_file_fallback_zero_first_sector(BlockBackend *blk,return 0 ; } -static int bdrv_create_file_fallback(const char *filename, BlockDriver *drv,
block.c static int create_file_fallback_zero_first_sector(BlockBackend *blk, · line 609
Quoted 10 lines
block.c +9
-1- QemuOpts *opts, Error **errp) +/** +* Simple implementation of bdrv_co_create_opts for protocol drivers +* which only support creation via opening a file +* (usually existing raw storage device) +*/ +int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv, +const char *filename, +QemuOpts *opts, +Error **errp)
The alignment’s off (in the header, too), but that can be fixed when this series is applied.
block.c int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) · line 673
Quoted 13 lines
block.c +1
-5{BlockBackend *blk;QDict *options;@@ -663,11 +670,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp)return -ENOENT ; } -if (drv->bdrv_co_create_opts) { -return bdrv_create (drv, filename, opts, errp); - }else { -return bdrv_create_file_fallback (filename, drv, opts, errp); - } +return bdrv_create (drv, filename, opts, errp);
I thought we’d just let the drivers set BlockDriver.create_opts to &bdrv_create_opts_simple and keep this bit of code (maybe with an “else if (drv->create_opts != NULL)” and an “assert(drv->create_opts == &bdrv_create_opts_simple)”). That would make the first patch unnecessary.
OTOH, it’s completely reasonable to pass the object as the first argument to a class method, so why not. (Well, technically the BlockDriver kind of is the class, and the BDS is the object, it’s weird.) And it definitely follows what we do elsewhere (to provide default implementations for block drivers to use).
Quoted 3 lines
block.c +0
-0} int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp)
[...]
Quoted 4 lines
block/file-posix.c +0
-0
[...]
block/file-posix.c static BlockDriver bdrv_host_cdrom = { · line 3645
Quoted 10 lines
block/file-posix.c +2
-1@@ -3639,10 +3641,11 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple, .mutable_opts = mutable_opts, .bdrv_co_invalidate_cache = raw_co_invalidate_cache, -
This line removal seems unrelated, but why not.
Max
Quoted 3 lines
block/file-posix.c +0
-0.bdrv_co_preadv = raw_co_preadv, .bdrv_co_pwritev = raw_co_pwritev, .bdrv_co_flush_to_disk = raw_co_flush_to_disk,
Re: [PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
In reply to Maxim LevitskyQuoted 1 line · Maxim Levitsky
Instead of checking the .bdrv_co_create_opts to see if we need the failback,
fallback
Quoted 10 lines
just implement the .bdrv_co_create_opts in the drivers that need it.
This way we don't break various places that need to know if the underlying protocol/format really supports image creation, and this way we still allow some drivers to not support image creation.
Fixes fd17146cd93d1704cd96d7c2757b325fc7aac6fdBugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816007
Note that technically this driver reverts the image creation failback
fallback
Quoted 5 lines
for the vxhs driver since I don't have a means to test it, and IMHO it is better to leave it not supported as it was prior to generic image creation patches.
Also drop
iscsi_create_optswhich was left accidently
accidentally
block/file-posix.c static BlockDriver bdrv_host_device = { · line 3517
Quoted 10 lines
Signed-off-by Maxim Levitsky <[email protected]>---
+++b/block/file-posix.cblock/file-posix.c +2
-0@@ -3513,6 +3513,8 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple,
I'd drop the leading & for consistency with the rest of this struct initializer.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
Am 26.03.2020 um 14:20 hat Eric Blake geschrieben:
Quoted 10 lines
block/file-posix.c static BlockDriver bdrv_host_device = { · line 3517
Quoted 7 lines
+++
b/block/file-posix.cblock/file-posix.c +2
-0@@ -3513,6 +3513,8 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple,I'd drop the leading & for consistency with the rest of this struct initializer.
This one isn't a function pointer, so I think the & is necessary.
Kevin
Re: [PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
Quoted 12 lines · Kevin Wolf
Am 26.03.2020 um 14:20 hat Eric Blake geschrieben:
Quoted 10 lines
block/file-posix.c static BlockDriver bdrv_host_device = { · line 3517
Quoted 7 lines
+++
b/block/file-posix.cblock/file-posix.c +2
-0@@ -3513,6 +3513,8 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple,I'd drop the leading & for consistency with the rest of this struct initializer.
Quoted 1 line
This one isn't a function pointer, so I think the & is necessary.
Ah, right. Visual pattern-matching failed me, since I didn't read the actual types in the .h file.
Hmm - is it possible to write the patch in such a way that .create_opts can be left NULL when .bdrv_co_create_opts is bdrv_co_create_opts_simple?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
Quoted 13 lines · Eric Blake
Quoted 12 lines · Kevin Wolf
Am 26.03.2020 um 14:20 hat Eric Blake geschrieben:
Quoted 10 lines
block/file-posix.c static BlockDriver bdrv_host_device = { · line 3517
Quoted 7 lines
+++
b/block/file-posix.cblock/file-posix.c +2
-0@@ -3513,6 +3513,8 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple,I'd drop the leading & for consistency with the rest of this struct initializer.
Quoted 7 lines
Quoted 1 line
This one isn't a function pointer, so I think the & is necessary.
Ah, right. Visual pattern-matching failed me, since I didn't read the actual types in the .h file.
Hmm - is it possible to write the patch in such a way that .create_opts can be left NULL when .bdrv_co_create_opts is
bdrv_co_create_opts_simple?
Setting .create_opts is actually the main point of this series, so we don’t have to look for and fix all places that decide whether a block driver is capable of image creation based on whether it’s set or not.
Max
Re: [PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
In reply to Eric BlakeQuoted 4 lines · Eric Blake
Quoted 1 line · Maxim Levitsky
Instead of checking the .bdrv_co_create_opts to see if we need the failback,
fallback
100% true.
Quoted 14 lines
Quoted 11 lines
just implement the .bdrv_co_create_opts in the drivers that need it.
This way we don't break various places that need to know if the underlying protocol/format really supports image creation, and this way we still allow some drivers to not support image creation.
Fixes fd17146cd93d1704cd96d7c2757b325fc7aac6fdBugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816007
Note that technically this driver reverts the image creation failback
fallback
Quoted 7 lines
Quoted 5 lines
for the vxhs driver since I don't have a means to test it, and IMHO it is better to leave it not supported as it was prior to generic image creation patches.
Also drop
iscsi_create_optswhich was left accidentlyaccidentally
True. I did a spell check on the commit message, but I guess I updated it afterward with this.
Quoted 14 lines
block/file-posix.c static BlockDriver bdrv_host_device = { · line 3517
Quoted 11 lines
Signed-off-by Maxim Levitsky <[email protected]>---
+++b/block/file-posix.cblock/file-posix.c +2
-0@@ -3513,6 +3513,8 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_prepare = raw_reopen_prepare, .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, + .bdrv_co_create_opts = bdrv_co_create_opts_simple, + .create_opts = &bdrv_create_opts_simple,I'd drop the leading & for consistency with the rest of this struct initializer.
Can I? This is struct reference and I think that only for function references, the leading & is optional.
Best regards,
Maxim Levitsky
Quoted 37 lines · Maxim Levitsky
The recent patches from Max Reitz allowed some block drivers to not provide the .bdrv_co_create_opts and still allow qemu-img to create/format images as long as the image is already existing (that is the case with various block storage drivers like nbd/iscsi/nvme, etc)
However it was found out that some places in the code depend on the .bdrv_co_create_opts/.create_opts to be != NULL to decide if to allow image creation.
To avoid adding failback code to all these places, just make generic failback code be used by the drivers that need it, so that for outside user, there is no diffirence if failback was used or not.
Best regards,
Maxim LevitskyMaxim Levitsky (2):
block: pass BlockDriver reference to the .bdrv_co_create
block: trickle down the fallback image creation function use to the
block driversblock.c | 38 ++++++++++++++++++++++---------------- block/crypto.c | 3 ++- block/file-posix.c | 11 +++++++++-- block/file-win32.c | 4 +++- block/gluster.c | 3 ++- block/iscsi.c | 16 ++++------------ block/nbd.c | 6 ++++++ block/nfs.c | 4 +++- block/nvme.c | 3 +++ block/parallels.c | 3 ++- block/qcow.c | 3 ++- block/qcow2.c | 4 +++- block/qed.c | 3 ++- block/raw-format.c | 4 +++- block/rbd.c | 3 ++- block/sheepdog.c | 4 +++-
Quoted 9 lines
block/ssh.c | 4 +++- block/vdi.c | 4 +++- block/vhdx.c | 3 ++- block/vmdk.c | 4 +++- block/vpc.c | 6 ++++-- include/block/block.h | 7 +++++++ include/block/block_int.h | 3 ++- 23 files changed, 95 insertions(+), 48 deletions(-)
Quoted 13 lines · Maxim Levitsky
The recent patches from Max Reitz allowed some block drivers to not provide the .bdrv_co_create_opts and still allow qemu-img to create/format images as long as the image is already existing (that is the case with various block storage drivers like nbd/iscsi/nvme, etc)
However it was found out that some places in the code depend on the .bdrv_co_create_opts/.create_opts to be != NULL to decide if to allow image creation.
To avoid adding failback code to all these places, just make generic failback code be used by the drivers that need it, so that for outside user, there is no diffirence if failback was used or not.
Quoted 7 lines
Best regards,
Maxim LevitskyMaxim Levitsky (2):
block: pass BlockDriver reference to the .bdrv_co_create
block: trickle down the fallback image creation function use to the
block drivers
Thanks, fixed the function parameter alignment, moved the declarations from block.h into block_int.h, and applied the series to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Max
Quoted 17 lines · Max Reitz
Quoted 16 lines · Maxim Levitsky
The recent patches from Max Reitz allowed some block drivers to not provide the .bdrv_co_create_opts and still allow qemu-img to create/format images as long as the image is already existing (that is the case with various block storage drivers like nbd/iscsi/nvme, etc)
However it was found out that some places in the code depend on the .bdrv_co_create_opts/.create_opts to be != NULL to decide if to allow image creation.
To avoid adding failback code to all these places, just make generic failback code be used by the drivers that need it, so that for outside user, there is no diffirence if failback was used or not.
Best regards,
Maxim Levitsky
Quoted 7 lines
Quoted 4 lines
Maxim Levitsky (2):
block: pass BlockDriver reference to the .bdrv_co_create
block: trickle down the fallback image creation function use to the
block driversThanks, fixed the function parameter alignment, moved the declarations from
block.hintoblock_int.h, and applied the series to my block branch:
(And the spelling fixes suggested by Eric)
Quoted 4 lines
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Max