block: Fix some filename generation issues
v12 cover block: Fix some filename generation issues
Once more, I’ll spare both me and you another iteration of the cover letter, so I direct you to the previous version’s cover letter (which will direct you further):
http://lists.nongnu.org/archive/html/qemu-block/2018-10/msg00229.html
There are only minor changes in this version. Provided no major complaints arise, I intend to merge this series in the next month.
git-backport-diff against v11:
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/31:[0015] [FC] 'block: Use bdrv_refresh_filename() to pull' 002/31:[----] [--] 'block: Use children list in bdrv_refresh_filename' 003/31:[----] [--] 'block: Skip implicit nodes for filename info' 004/31:[----] [--] 'block: Add BDS.auto_backing_file' 005/31:[----] [--] 'block: Respect backing bs in bdrv_refresh_filename' 006/31:[----] [--] 'iotests.py: Add filter_imgfmt()'
007/31:[----] [--] 'iotests.py: Add node_info()'
008/31:[0072] [FC] 'iotests: Add test for backing file overrides' 009/31:[----] [--] 'block: Make path_combine() return the path' 010/31:[----] [-C] 'block: bdrv_get_full_backing_filename_from_...'s ret. val.' 011/31:[----] [--] 'block: bdrv_get_full_backing_filename's ret. val.' 012/31:[----] [--] 'block: Add bdrv_make_absolute_filename()' 013/31:[----] [--] 'block: Fix bdrv_find_backing_image()' 014/31:[----] [--] 'block: Add bdrv_dirname()'
015/31:[----] [--] 'blkverify: Make bdrv_dirname() return NULL' 016/31:[----] [--] 'quorum: Make bdrv_dirname() return NULL' 017/31:[----] [--] 'block/nbd: Make bdrv_dirname() return NULL' 018/31:[----] [--] 'block/nfs: Implement bdrv_dirname()' 019/31:[----] [--] 'block: Use bdrv_dirname() for relative filenames' 020/31:[----] [--] 'iotests: Add quorum case to test 110' 021/31:[----] [--] 'block: Add strong_runtime_opts to BlockDriver' 022/31:[----] [--] 'block: Add BlockDriver.bdrv_gather_child_options' 023/31:[----] [--] 'block: Generically refresh runtime options' 024/31:[----] [--] 'block: Purify .bdrv_refresh_filename()' 025/31:[----] [--] 'block: Do not copy exact_filename from format file' 026/31:[----] [--] 'block/nvme: Fix bdrv_refresh_filename()' 027/31:[----] [--] 'block/curl: Harmonize option defaults' 028/31:[----] [--] 'block/curl: Implement bdrv_refresh_filename()' 029/31:[----] [--] 'block/null: Generate filename even with latency-ns' 030/31:[----] [--] 'block: BDS options may lack the "driver" option' 031/31:[0024] [FC] 'iotests: Test json:{} filenames of internal BDSs'
v12:
- Patch 1:
- Due to rebase, one hunk was dropped (vpc has one instance of
"bs->filename" less)
- I grepped through everything ("->filename") again and noticed I did not refresh the filename before qemu-img.c's accesses to bs->filename. Now it probably isn't necessary to do this (because we don't use complex graph features there, and even more so no graph modifications can occur at runtime), but then again I believe it doesn't hurt to refresh the filename even here.
So there are four additional hunks in qemu-img.c now.
- Patches 8 and 31:
Had to adjust the reference output due to the Python2/3 compatibility patches (kept the R-b, because the changes are obvious, I believe)
Max Reitz (31):
block: Use bdrv_refresh_filename() to pull
block: Use children list in bdrv_refresh_filename
block: Skip implicit nodes for filename info
block: Add BDS.auto_backing_file
block: Respect backing bs in bdrv_refresh_filename iotests.py: Add filter_imgfmt()
iotests.py: Add node_info()
iotests: Add test for backing file overrides
block: Make path_combine() return the path
block: bdrv_get_full_backing_filename_from_...'s ret. val.
block: bdrv_get_full_backing_filename's ret. val.
block: Add bdrv_make_absolute_filename()
block: Fix bdrv_find_backing_image()
block: Add bdrv_dirname()
blkverify: Make bdrv_dirname() return NULL
quorum: Make bdrv_dirname() return NULL block/nbd: Make bdrv_dirname() return NULL block/nfs: Implement bdrv_dirname()
block: Use bdrv_dirname() for relative filenames
iotests: Add quorum case to test 110
block: Add strong_runtime_opts to BlockDriver
block: Add BlockDriver.bdrv_gather_child_options
block: Generically refresh runtime options
block: Purify .bdrv_refresh_filename()
block: Do not copy exact_filename from format file block/nvme: Fix bdrv_refresh_filename() block/curl: Harmonize option defaults block/curl: Implement bdrv_refresh_filename() block/null: Generate filename even with latency-ns
block: BDS options may lack the "driver" option
iotests: Test json:{} filenames of internal BDSs
include/block/block.h | 16 +- include/block/block_int.h | 48 +++- block.c | 503 ++++++++++++++++++++++------------ block/blkdebug.c | 70 ++--- block/blklogwrites.c | 34 +-- block/blkverify.c | 29 +- block/commit.c | 3 +- block/crypto.c | 8 + block/curl.c | 55 +++- block/gluster.c | 19 ++ block/iscsi.c | 18 ++ block/mirror.c | 3 +- block/nbd.c | 46 ++-- block/nfs.c | 54 ++-- block/null.c | 32 ++- block/nvme.c | 27 +- block/qapi.c | 16 +- block/qcow.c | 14 +- block/qcow2.c | 17 +- block/qed.c | 7 +- block/quorum.c | 71 +++-- block/raw-format.c | 11 +- block/rbd.c | 14 + block/replication.c | 10 +- block/sheepdog.c | 12 + block/ssh.c | 12 + block/throttle.c | 7 + block/vhdx-log.c | 1 + block/vmdk.c | 43 ++- block/vpc.c | 7 + block/vvfat.c | 12 + block/vxhs.c | 11 + blockdev.c | 8 + qemu-img.c | 23 +- tests/qemu-iotests/051.out | 8 +- tests/qemu-iotests/051.pc.out | 8 +- tests/qemu-iotests/110 | 29 +- tests/qemu-iotests/110.out | 9 +- tests/qemu-iotests/224 | 139 ++++++++++ tests/qemu-iotests/224.out | 18 ++ tests/qemu-iotests/228 | 235 ++++++++++++++++ tests/qemu-iotests/228.out | 84 ++++++ tests/qemu-iotests/group | 2 + tests/qemu-iotests/iotests.py | 10 + 44 files changed, 1398 insertions(+), 405 deletions(-) create mode 100755 tests/qemu-iotests/224 create mode 100644 tests/qemu-iotests/224.out create mode 100755 tests/qemu-iotests/228 create mode 100644 tests/qemu-iotests/228.out
Signature · 1 line
2.19.2
PATCH v12 1/31 block: Use bdrv_refresh_filename() to pull
Before this patch, bdrv_refresh_filename() is used in a pushing manner:
Whenever the BDS graph is modified, the parents of the modified edges are supposed to be updated (recursively upwards). However, that is nonviable, considering that we want child changes not to concern parents.
Also, in the long run we want a pull model anyway: Here, we would have a bdrv_filename() function which returns a BDS's filename, freshly constructed.
This patch is an intermediate step. It adds bdrv_refresh_filename() calls before every place a BDS.filename value is used. The only exceptions are protocol drivers that use their own filename, which clearly would not profit from refreshing that filename before.
Also, bdrv_get_encrypted_filename() is removed along the way (as a user of BDS.filename), since it is completely unused.
In turn, all of the calls to bdrv_refresh_filename() before this patch are removed, because we no longer have to call this function on graph changes.
--- include/block/block.h | 1 - block.c | 31 +++++++++++++++---------------- block/qapi.c | 4 ++++ block/raw-format.c | 1 + block/replication.c | 2 -- block/vhdx-log.c | 1 + block/vmdk.c | 6 ++++++ blockdev.c | 8 ++++++++ qemu-img.c | 11 +++++++++-- 9 files changed, 44 insertions(+), 21 deletions(-)
include/block/block.h +0 -1
@@ -483,7 +483,6 @@ void bdrv_round_to_clusters(BlockDriverState *bs,int64_t *cluster_offset, int64_t *cluster_bytes); -const char *bdrv_get_encrypted_filename (BlockDriverState *bs);void bdrv_get_backing_filename (BlockDriverState *bs,char *filename,int filename_size); void bdrv_get_full_backing_filename(BlockDriverState *bs,
block.c +15 -16
@@ -323,8 +323,11 @@ void bdrv_get_full_backing_filename_from_filename(const char *backed,void bdrv_get_full_backing_filename (BlockDriverState *bs,char *dest,size_t sz,Error **errp) { -char *backed = bs->exact_filename[0 ] ? bs->exact_filename : bs->filename; +char *backed; +bdrv_refresh_filename (bs); + + backed = bs->exact_filename[0 ] ? bs->exact_filename : bs->filename;bdrv_get_full_backing_filename_from_filename (backed, bs->backing_file, dest, sz, errp); }
@@ -1004,6 +1007,8 @@ static void bdrv_backing_attach(BdrvChild *c)"node is used as backing hd of '%s'" , bdrv_get_device_or_node_name(parent)); +bdrv_refresh_filename (backing_hd); + parent->open_flags &= ~BDRV_O_NO_BACKING ;pstrcpy (parent->backing_file,sizeof (parent->backing_file), backing_hd->filename);
@@ -1413,6 +1418,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file, }if (file !=NULL ) { +bdrv_refresh_filename (blk_bs (file)); filename =blk_bs (file)->filename; }else {/*
@@ -2303,8 +2309,6 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd,bdrv_unref (backing_hd); } -bdrv_refresh_filename (bs); - out:bdrv_refresh_limits (bs,NULL ); }
@@ -2833,8 +2837,6 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,g_free (child_key_dot); } -bdrv_refresh_filename (bs); -/* Check if any unknown options were used */ if (qdict_size (options) !=0 ) {const QDictEntry *entry =qdict_first (options);
@@ -3279,6 +3281,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,if (local_err !=NULL ) {error_propagate (errp, local_err); }else { +bdrv_refresh_filename (reopen_state->bs);error_setg (errp,"failed while preparing to reopen image '%s'" , reopen_state->bs->filename); }
@@ -3874,7 +3877,10 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,/* success - we can delete the intermediate states, and link top->base */ /* TODO Check graph modification op blockers (BLK_PERM_GRAPH_MOD) once * we've figured out how they should work. */ - backing_file_str = backing_file_str ? backing_file_str : base->filename; +if (!backing_file_str) { +bdrv_refresh_filename (base); + backing_file_str = base->filename; + } QLIST_FOREACH_SAFE(c, &top->parents, next_parent, next) {/* Check whether we are allowed to switch c from top to base */
@@ -4274,16 +4280,6 @@ bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs)return bs->supported_zero_flags &BDRV_REQ_MAY_UNMAP ; } -const char *bdrv_get_encrypted_filename (BlockDriverState *bs) -{ -if (bs->backing && bs->backing->bs->encrypted) -return bs->backing_file; -else if (bs->encrypted) -return bs->filename; -else -return NULL ; -} -void bdrv_get_backing_filename (BlockDriverState *bs,char *filename,int filename_size) {
@@ -4403,6 +4399,9 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, is_protocol =path_has_protocol (backing_file); +/* This will recursively refresh everything in the backing chain */ +bdrv_refresh_filename (bs); +for (curr_bs = bs; curr_bs->backing; curr_bs = curr_bs->backing->bs) {/* If either of the filename paths is actually a protocol, then
block/qapi.c +4 -0
@@ -51,6 +51,8 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,return NULL ; } +bdrv_refresh_filename (bs); + info =g_malloc0 (sizeof (*info)); info->file =g_strdup (bs->filename); info->ro = bs->read_only;
@@ -264,6 +266,8 @@ void bdrv_query_image_info(BlockDriverState *bs, goto out; } +bdrv_refresh_filename (bs); + info =g_new0 (ImageInfo,1 ); info->filename =g_strdup (bs->filename); info->format =g_strdup (bdrv_get_format_name (bs));
block/raw-format.c +1 -0
@@ -436,6 +436,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, bs->file->bs->supported_zero_flags);if (bs->probed && !bdrv_is_read_only (bs)) { +bdrv_refresh_filename (bs->file->bs);fprintf (stderr,"WARNING: Image format was not specified for '%s' and probing " "guessed raw.\n"
block/replication.c +0 -2
@@ -616,8 +616,6 @@ static void replication_done(void *opaque, int ret)if (ret ==0 ) { s->stage =BLOCK_REPLICATION_DONE ; -/* refresh top bs's filename */ -bdrv_refresh_filename (bs); s->active_disk =NULL ; s->secondary_disk =NULL ; s->hidden_disk =NULL ;
block/vhdx-log.c +1 -0
@@ -803,6 +803,7 @@ int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,if (logs.valid) {if (bs->read_only) { +bdrv_refresh_filename (bs); ret = -EPERM ;error_setg (errp, "VHDX image file '%s' opened read-only, but "
block/vmdk.c +6 -0
@@ -479,6 +479,7 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent, extent->l1_table, l1_size);if (ret <0 ) { +bdrv_refresh_filename (extent->file->bs);error_setg_errno (errp, -ret,"Could not read l1 table from extent '%s'" , extent->file->bs->filename);
@@ -499,6 +500,7 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent, extent->l1_backup_table, l1_size);if (ret <0 ) { +bdrv_refresh_filename (extent->file->bs);error_setg_errno (errp, -ret,"Could not read l1 backup table from extent '%s'" , extent->file->bs->filename);
@@ -530,6 +532,7 @@ static int vmdk_open_vmfs_sparse(BlockDriverState *bs, ret =bdrv_pread (file,sizeof (magic), &header,sizeof (header));if (ret <0 ) { +bdrv_refresh_filename (file->bs);error_setg_errno (errp, -ret,"Could not read header from file '%s'" , file->bs->filename);
@@ -607,6 +610,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, ret =bdrv_pread (file,sizeof (magic), &header,sizeof (header));if (ret <0 ) { +bdrv_refresh_filename (file->bs);error_setg_errno (errp, -ret,"Could not read header from file '%s'" , file->bs->filename);
@@ -861,6 +865,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,if (!path_is_absolute (fname) && !path_has_protocol (fname) && !desc_file_path[0 ]) { +bdrv_refresh_filename (bs->file->bs);error_setg (errp,"Cannot use relative extent paths with VMDK " "descriptor file '%s'" , bs->file->bs->filename);return -EINVAL ;
@@ -2241,6 +2246,7 @@ static ImageInfo *vmdk_get_extent_info(VmdkExtent *extent) {ImageInfo *info =g_new0 (ImageInfo,1 ); +bdrv_refresh_filename (extent->file->bs); *info = (ImageInfo ){ .filename =g_strdup (extent->file->bs->filename), .format =g_strdup (extent->type),
blockdev.c +8 -0
@@ -1629,6 +1629,7 @@ static void external_snapshot_prepare(BlkActionState *common,error_setg_errno (errp, -size,"bdrv_getlength failed" ); goto out; } +bdrv_refresh_filename (state->old_bs); bdrv_img_create(new_image_file, format, state->old_bs->filename, state->old_bs->drv->format_name,
@@ -3191,6 +3192,7 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device, goto out; }assert (bdrv_get_aio_context (base_bs) == aio_context); +bdrv_refresh_filename (base_bs); base_name = base_bs->filename; }
@@ -3310,6 +3312,10 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, goto out; } }else if (has_top && top) { +/* This strcmp() is just a shortcut, there is no need to +* refresh @bs's filename. If it mismatches, +* bdrv_find_backing_image() will do the refresh and may still +* return @bs. */ if (strcmp (bs->filename, top) !=0 ) { top_bs =bdrv_find_backing_image (bs, top); }
@@ -3470,6 +3476,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,if (backup->mode !=NEW_IMAGE_MODE_EXISTING ) {assert (backup->format);if (source) { +bdrv_refresh_filename (source);bdrv_img_create (backup->target, backup->format, source->filename, source->drv->format_name,NULL , size, flags, false, &local_err);
@@ -3845,6 +3852,7 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)break ;case NEW_IMAGE_MODE_ABSOLUTE_PATHS :/* create new image with backing file */ +bdrv_refresh_filename (source); bdrv_img_create(arg->target, format, source->filename, source->drv->format_name,
qemu-img.c +9 -2
@@ -2790,6 +2790,7 @@ static int get_block_status(BlockDriverState *bs, int64_t offset,BlockDriverState *file;bool has_offset;int64_t map; +char *filename =NULL ;/* As an optimization, we could cache the current range of unallocated * clusters in each file of the chain, and avoid querying the same
@@ -2817,6 +2818,11 @@ static int get_block_status(BlockDriverState *bs, int64_t offset, has_offset = !!(ret &BDRV_BLOCK_OFFSET_VALID ); +if (file && has_offset) { +bdrv_refresh_filename (file); + filename = file->filename; + } + *e = (MapEntry ) { .start = offset, .length = bytes,
@@ -2825,8 +2831,8 @@ static int get_block_status(BlockDriverState *bs, int64_t offset, .offset = map, .has_offset = has_offset, .depth = depth, - .has_filename = file && has_offset, - .filename = file && has_offset ? file->filename : NULL, + .has_filename = filename, + .filename = filename, };return 0 ;
@@ -3327,6 +3333,7 @@ static int img_rebase(int argc, char **argv)qdict_put_bool (options,BDRV_OPT_FORCE_SHARE , true); } +bdrv_refresh_filename (bs); overlay_filename = bs->exact_filename[0 ] ? bs->exact_filename : bs->filename; out_real_path =g_malloc (PATH_MAX );
Signature · 1 line
2.19.2
Re: [Qemu-devel] [PATCH v12 01/31] block: Use bdrv_refresh_filename() to pull
Quoted 10 lines · Max Reitz
qemu-img.c +1
-0@@ -3327,6 +3333,7 @@ static int img_rebase(int argc, char **argv)qdict_put_bool (options,BDRV_OPT_FORCE_SHARE , true); } +bdrv_refresh_filename (bs); overlay_filename = bs->exact_filename[0 ] ? bs->exact_filename : bs->filename; out_real_path =g_malloc (PATH_MAX );Signature · 1 line
2.19.2
I also doubt that these new hunks are necessary, but it doesn't hurt to be consistent :)
Berto
PATCH v12 2/31 block: Use children list in bdrv_refresh_filename
In reply to Max Reitzbdrv_refresh_filename() should invoke itself recursively on all children, not just on file.
With that change, we can remove the manual invocations in blkverify, quorum, commit, mirror, and blklogwrites.
--- block.c | 9 +++++---- block/blklogwrites.c | 3 --- block/blkverify.c | 3 --- block/commit.c | 1 - block/mirror.c | 1 - block/quorum.c | 1 - 6 files changed, 5 insertions(+), 13 deletions(-)
block.c +5 -4
@@ -5318,16 +5318,17 @@ static bool append_open_options(QDict *d, BlockDriverState *bs)void bdrv_refresh_filename (BlockDriverState *bs) {BlockDriver *drv = bs->drv; +BdrvChild *child;QDict *opts;if (!drv) {return ; } -/* This BDS's file name will most probably depend on its file's name, so -* refresh that first */ -if (bs->file) { -bdrv_refresh_filename (bs->file->bs); +/* This BDS's file name may depend on any of its children's file names, so +* refresh those first */ + QLIST_FOREACH(child, &bs->children, next) { +bdrv_refresh_filename (child->bs); }if (drv->bdrv_refresh_filename) {
block/blklogwrites.c +0 -3
@@ -285,9 +285,6 @@ static void blk_log_writes_refresh_filename(BlockDriverState *bs, {BDRVBlkLogWritesState *s = bs->opaque; -/* bs->file->bs has already been refreshed */ -bdrv_refresh_filename (s->log_file->bs); -if (bs->file->bs->full_open_options && s->log_file->bs->full_open_options) {
block/blkverify.c +0 -3
@@ -285,9 +285,6 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options) {BDRVBlkverifyState *s = bs->opaque; -/* bs->file->bs has already been refreshed */ -bdrv_refresh_filename (s->test_file->bs); -if (bs->file->bs->full_open_options && s->test_file->bs->full_open_options) {
block/commit.c +0 -1
@@ -232,7 +232,6 @@ static int coroutine_fn bdrv_commit_top_preadv(BlockDriverState *bs,static void bdrv_commit_top_refresh_filename (BlockDriverState *bs,QDict *opts) { -bdrv_refresh_filename (bs->backing->bs);pstrcpy (bs->exact_filename,sizeof (bs->exact_filename), bs->backing->bs->filename); }
block/mirror.c +0 -1
@@ -1439,7 +1439,6 @@ static void bdrv_mirror_top_refresh_filename(BlockDriverState *bs, QDict *opts)* bdrv_set_backing_hd */ return ; } -bdrv_refresh_filename (bs->backing->bs);pstrcpy (bs->exact_filename,sizeof (bs->exact_filename), bs->backing->bs->filename); }
block/quorum.c +0 -1
@@ -1073,7 +1073,6 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options)int i;for (i =0 ; i < s->num_children; i++) { -bdrv_refresh_filename (s->children[i]->bs);if (!s->children[i]->bs->full_open_options) {return ; }
Signature · 1 line
2.19.2
PATCH v12 3/31 block: Skip implicit nodes for filename info
In reply to Max Reitzbdrv_refresh_filename() should simply skip all implicit nodes. They are supposed to be invisible to the user, so they should not appear in filename information.
--- block.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
block.c +14 -0
@@ -5331,6 +5331,20 @@ void bdrv_refresh_filename(BlockDriverState *bs)bdrv_refresh_filename (child->bs); } +if (bs->implicit) { +/* For implicit nodes, just copy everything from the single child */ + child =QLIST_FIRST (&bs->children); +assert (QLIST_NEXT (child, next) ==NULL ); + +pstrcpy (bs->exact_filename,sizeof (bs->exact_filename), + child->bs->exact_filename); +pstrcpy (bs->filename,sizeof (bs->filename), child->bs->filename); + + bs->full_open_options =qobject_ref (child->bs->full_open_options); + +return ; + } +if (drv->bdrv_refresh_filename) {/* Obsolete information is of no use here, so drop the old file name * information before refreshing it */
Signature · 1 line
2.19.2
PATCH v12 4/31 block: Add BDS.auto_backing_file
In reply to Max ReitzIf the backing file is overridden, this most probably does change the guest-visible data of a BDS. Therefore, we will need to consider this in bdrv_refresh_filename().
To see whether it has been overridden, we might want to compare bs->backing_file and bs->backing->bs->filename. However, bs->backing_file is changed by bdrv_set_backing_hd() (which is just used to change the backing child at runtime, without modifying the image header), so bs->backing_file most of the time simply contains a copy of bs->backing->bs->filename anyway, so it is useless for such a comparison.
This patch adds an auto_backing_file BDS field which contains the backing file path as indicated by the image header, which is not changed by bdrv_set_backing_hd().
Because of bdrv_refresh_filename() magic, however, a BDS's filename may differ from what has been specified during bdrv_open(). Then, the comparison between bs->auto_backing_file and bs->backing->bs->filename may fail even though bs->backing was opened from bs->auto_backing_file. To mitigate this, we can copy the real BDS's filename (after the whole bdrv_open() and bdrv_refresh_filename() process) into bs->auto_backing_file, if we know the former has been opened based on the latter. This is only possible if no options modifying the backing file's behavior have been specified, though. To simplify things, this patch only copies the filename from the backing file if no options have been specified for it at all.
Furthermore, there are cases where an overlay is created by qemu which already contains a BDS's filename (e.g. in blockdev-snapshot-sync). We do not need to worry about updating the overlay's bs->auto_backing_file there, because we actually wrote a post-bdrv_refresh_filename() filename into the image header.
So all in all, there will be false negatives where (as of a future patch) bdrv_refresh_filename() will assume that the backing file differs from what was specified in the image header, even though it really does not. However, these cases should be limited to where (1) the user actually did override something in the backing chain (e.g. by specifying options for the backing file), or (2) the user executed a QMP command to change some node's backing file (e.g. change-backing-file or block-commit with @backing-file given) where the given filename does not happen to coincide with qemu's idea of the backing BDS's filename.
Then again, (1) really is limited to -drive. With -blockdev or blockdev-add, you have to adhere to the schema, so a user cannot give partial "unimportant" options (e.g. by just setting backing.node-name and leaving the rest to the image header). Therefore, trying to fix this would mean trying to fix something for -drive only.
To improve on (2), we would need a full infrastructure to "canonicalize" an arbitrary filename (+ options), so it can be compared against another. That seems a bit over the top, considering that filenames nowadays are there mostly for the user's entertainment.
--- include/block/block_int.h | 4 ++++ block.c | 19 +++++++++++++++++++ block/qcow.c | 7 +++++-- block/qcow2.c | 10 +++++++--- block/qed.c | 7 +++++-- block/vmdk.c | 6 ++++-- 6 files changed, 44 insertions(+), 9 deletions(-)
include/block/block_int.h +4 -0
@@ -696,6 +696,10 @@ struct BlockDriverState {char filename[PATH_MAX ];char backing_file[PATH_MAX ];/* if non zero, the image is a diff of this file image */ +/* The backing filename indicated by the image header; if we ever +* open this file, then this is replaced by the resulting BDS's +* filename (i.e. after a bdrv_refresh_filename() run). */ +char auto_backing_file[PATH_MAX ];char backing_format[16 ];/* if non-zero and backing_file exists */ QDict *full_open_options;
block.c +19 -0
@@ -2330,6 +2330,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,char *bdref_key_dot;const char *reference =NULL ;int ret =0 ; +bool implicit_backing = false;BlockDriverState *backing_hd;QDict *options;QDict *tmp_parent_options =NULL ;
@@ -2365,6 +2366,16 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,qobject_unref (options); goto free_exit; }else { +if (qdict_size (options) ==0 ) { +/* If the user specifies options that do not modify the +* backing file's behavior, we might still consider it the +* implicit backing file. But it's easier this way, and +* just specifying some of the backing BDS's options is +* only possible with -drive anyway (otherwise the QAPI +* schema forces the user to specify everything). */ + implicit_backing = !strcmp (bs->auto_backing_file, bs->backing_file); + } +bdrv_get_full_backing_filename (bs, backing_filename,PATH_MAX , &local_err);if (local_err) {
@@ -2398,6 +2409,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, }bdrv_set_aio_context (backing_hd,bdrv_get_aio_context (bs)); +if (implicit_backing) { +bdrv_refresh_filename (backing_hd); +pstrcpy (bs->auto_backing_file,sizeof (bs->auto_backing_file), + backing_hd->filename); + } +/* Hook up the backing file link; drop our reference, bs owns the * backing_hd reference now */ bdrv_set_backing_hd (bs, backing_hd, &local_err);
@@ -3785,6 +3802,8 @@ int bdrv_change_backing_file(BlockDriverState *bs,if (ret ==0 ) {pstrcpy (bs->backing_file,sizeof (bs->backing_file), backing_file ?:"" );pstrcpy (bs->backing_format,sizeof (bs->backing_format), backing_fmt ?:"" ); +pstrcpy (bs->auto_backing_file,sizeof (bs->auto_backing_file), + backing_file ?:"" ); }return ret; }
block/qcow.c +5 -2
@@ -31,6 +31,7 @@#include "qemu/module.h" #include "qemu/option.h" #include "qemu/bswap.h" +#include "qemu/cutils.h" #include <zlib.h> #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
@@ -295,11 +296,13 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } ret =bdrv_pread (bs->file, header.backing_file_offset, - bs->backing_file, len); + bs->auto_backing_file, len);if (ret <0 ) { goto fail; } - bs->backing_file[len] ='\0' ; + bs->auto_backing_file[len] ='\0' ; +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->auto_backing_file); }/* Disable migration when qcow images are used */
block/qcow2.c +7 -3
@@ -1474,13 +1474,15 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, goto fail; } ret =bdrv_pread (bs->file, header.backing_file_offset, - bs->backing_file, len); + bs->auto_backing_file, len);if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read backing file name" ); goto fail; } - bs->backing_file[len] ='\0' ; - s->image_backing_file =g_strdup (bs->backing_file); + bs->auto_backing_file[len] ='\0' ; +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->auto_backing_file); + s->image_backing_file =g_strdup (bs->auto_backing_file); }/* Internal snapshots */
@@ -2517,6 +2519,8 @@ static int qcow2_change_backing_file(BlockDriverState *bs,return -EINVAL ; } +pstrcpy (bs->auto_backing_file,sizeof (bs->auto_backing_file), + backing_file ?:"" );pstrcpy (bs->backing_file,sizeof (bs->backing_file), backing_file ?:"" );pstrcpy (bs->backing_format,sizeof (bs->backing_format), backing_fmt ?:"" );
block/qed.c +5 -2
@@ -454,11 +454,14 @@ static int coroutine_fn bdrv_qed_do_open(BlockDriverState *bs, QDict *options, } ret =qed_read_string (bs->file, s->header.backing_filename_offset, - s->header.backing_filename_size, bs->backing_file, -sizeof (bs->backing_file)); + s->header.backing_filename_size, + bs->auto_backing_file, +sizeof (bs->auto_backing_file));if (ret <0 ) {return ret; } +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->auto_backing_file);if (s->header.features &QED_F_BACKING_FORMAT_NO_PROBE ) {pstrcpy (bs->backing_format,sizeof (bs->backing_format),"raw" );
block/vmdk.c +4 -2
@@ -386,12 +386,14 @@ static int vmdk_parent_open(BlockDriverState *bs) ret = -EINVAL ; goto out; } -if ((end_name - p_name) >sizeof (bs->backing_file) -1 ) { +if ((end_name - p_name) >sizeof (bs->auto_backing_file) -1 ) { ret = -EINVAL ; goto out; } -pstrcpy (bs->backing_file, end_name - p_name +1 , p_name); +pstrcpy (bs->auto_backing_file, end_name - p_name +1 , p_name); +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->auto_backing_file); } out:
Signature · 1 line
2.19.2
PATCH v12 5/31 block: Respect backing bs in bdrv_refresh_filename
In reply to Max ReitzBasically, bdrv_refresh_filename() should respect all children of a BlockDriverState. However, generally those children are driver-specific, so this function cannot handle the general case. On the other hand, there are only few drivers which use other children than @file and @backing (that being vmdk, quorum, and blkverify).
Most block drivers only use @file and/or @backing (if they use any children at all). Both can be implemented directly in bdrv_refresh_filename.
The user overriding the file's filename is already handled, however, the user overriding the backing file is not. If this is done, opening the BDS with the plain filename of its file will not be correct, so we may not set bs->exact_filename in that case.
iotest 051 contains test cases for overriding the backing file, and so its output changes with this patch applied.
--- block.c | 38 ++++++++++++++++++++++++++++++++++- tests/qemu-iotests/051.out | 8 ++++---- tests/qemu-iotests/051.pc.out | 8 ++++---- 3 files changed, 45 insertions(+), 9 deletions(-)
block.c +37 -1
@@ -5322,6 +5322,21 @@ static bool append_open_options(QDict *d, BlockDriverState *bs)return found_any; } +/* Note: This function may return false positives; it may return true +* even if opening the backing file specified by bs's image header +* would result in exactly bs->backing. */ +static bool bdrv_backing_overridden (BlockDriverState *bs) +{ +if (bs->backing) { +return strcmp (bs->auto_backing_file, + bs->backing->bs->filename); + }else { +/* No backing BDS, so if the image header reports any backing +* file, it must have been suppressed */ +return bs->auto_backing_file[0 ] !='\0' ; + } +} +/* Updates the following BDS fields: * - exact_filename: A filename which may be used for opening a block device * which (mostly) equals the given BDS (even without any
@@ -5339,6 +5354,7 @@ void bdrv_refresh_filename(BlockDriverState *bs)BlockDriver *drv = bs->drv;BdrvChild *child;QDict *opts; +bool backing_overridden;if (!drv) {return ;
@@ -5364,6 +5380,16 @@ void bdrv_refresh_filename(BlockDriverState *bs)return ; } + backing_overridden =bdrv_backing_overridden (bs); + +if (bs->open_flags &BDRV_O_NO_IO ) { +/* Without I/O, the backing file does not change anything. +* Therefore, in such a case (primarily qemu-img), we can +* pretend the backing file has not been overridden even if +* it technically has been. */ + backing_overridden = false; + } +if (drv->bdrv_refresh_filename) {/* Obsolete information is of no use here, so drop the old file name * information before refreshing it */
@@ -5389,6 +5415,7 @@ void bdrv_refresh_filename(BlockDriverState *bs) opts =qdict_new (); has_open_options =append_open_options (opts, bs); + has_open_options |= backing_overridden;/* If no specific options have been given for this BDS, the filename of * the underlying file should suffice for this one as well */
@@ -5400,11 +5427,20 @@ void bdrv_refresh_filename(BlockDriverState *bs)* file BDS. The full options QDict of that file BDS should somehow * contain a representation of the filename, therefore the following * suffices without querying the (exact_)filename of this BDS. */ -if (bs->file->bs->full_open_options) { +if (bs->file->bs->full_open_options && + (!bs->backing || bs->backing->bs->full_open_options)) + {qdict_put_str (opts,"driver" , drv->format_name);qdict_put (opts,"file" ,qobject_ref (bs->file->bs->full_open_options)); +if (bs->backing) { +qdict_put (opts,"backing" , +qobject_ref (bs->backing->bs->full_open_options)); + }else if (backing_overridden) { +qdict_put_null (opts,"backing" ); + } + bs->full_open_options = opts; }else {qobject_unref (opts);
tests/qemu-iotests/051.out +4 -4
@@ -82,7 +82,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.orig"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writeback Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1)
@@ -172,7 +172,7 @@ QEMU_PROG: -drive driver=null-co,cache=invalid_value: invalid cache option Testing: -drive file=TEST_DIR/t.qcow2,cache=writeback,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writeback Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)
@@ -192,7 +192,7 @@ backing-file: TEST_DIR/t.qcow2.base (file, read-only) Testing: -drive file=TEST_DIR/t.qcow2,cache=writethrough,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writethrough Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)
@@ -212,7 +212,7 @@ backing-file: TEST_DIR/t.qcow2.base (file, read-only) Testing: -drive file=TEST_DIR/t.qcow2,cache=unsafe,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writeback, ignore flushes Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)
tests/qemu-iotests/051.pc.out +4 -4
@@ -82,7 +82,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.orig"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writeback Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1)
@@ -244,7 +244,7 @@ QEMU_PROG: -drive driver=null-co,cache=invalid_value: invalid cache option Testing: -drive file=TEST_DIR/t.qcow2,cache=writeback,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writeback Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)
@@ -264,7 +264,7 @@ backing-file: TEST_DIR/t.qcow2.base (file, read-only) Testing: -drive file=TEST_DIR/t.qcow2,cache=writethrough,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writethrough Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)
@@ -284,7 +284,7 @@ backing-file: TEST_DIR/t.qcow2.base (file, read-only) Testing: -drive file=TEST_DIR/t.qcow2,cache=unsafe,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) Removable device: not locked, tray closed Cache mode: writeback, ignore flushes Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)
Signature · 1 line
2.19.2
PATCH v12 6/31 iotests.py: Add filter_imgfmt()
In reply to Max Reitz--- tests/qemu-iotests/iotests.py | 3 +++ 1 file changed, 3 insertions(+)
tests/qemu-iotests/iotests.py +3 -0
@@ -251,6 +251,9 @@ def filter_img_info(output, filename): lines.append(line) return '\n'.join(lines) +def filter_imgfmt(msg): + return msg.replace(imgfmt, 'IMGFMT') + def log(msg, filters=[]): for flt in filters: msg = flt(msg)
Signature · 1 line
2.19.2
PATCH v12 7/31 iotests.py: Add node_info()
In reply to Max ReitzThis function queries a node; since we cannot do that right now, it executes query-named-block-nodes and returns the matching node's object.
--- tests/qemu-iotests/iotests.py | 7 +++++++ 1 file changed, 7 insertions(+)
tests/qemu-iotests/iotests.py +7 -0
@@ -474,6 +474,13 @@ class VM(qtest.QEMUQtestMachine): else: iotests.log(ev) + def node_info(self, node_name): + nodes = self.qmp('query-named-block-nodes') + for x in nodes['return']: + if x['node-name'] == node_name: + return x + return None + index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
Signature · 1 line
2.19.2
PATCH v12 8/31 iotests: Add test for backing file overrides
In reply to Max Reitz--- tests/qemu-iotests/228 | 235 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/228.out | 84 +++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 320 insertions(+) create mode 100755 tests/qemu-iotests/228 create mode 100644 tests/qemu-iotests/228.out
tests/qemu-iotests/228 new file +235 -0
@@ -0,0 +1,235 @@ +#!/usr/bin/env python +# +# Test for when a backing file is considered overridden (thus, a +# json:{} filename is generated for the overlay) and when it is not +# +# Copyright (C) 2018 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Creator/Owner: Max Reitz <[email protected]> + +import iotests +from iotests import log, qemu_img, filter_testfiles, filter_imgfmt + +# Need backing file and change-backing-file support +iotests.verify_image_format(supported_fmts=['qcow2', 'qed']) +iotests.verify_platform(['linux']) + + +def log_node_info(node): + log('') + + log('bs->filename: ' + node['image']['filename'], + filters=[filter_testfiles, filter_imgfmt]) + log('bs->backing_file: ' + node['backing_file'], + filters=[filter_testfiles, filter_imgfmt]) + + if 'backing-image' in node['image']: + log('bs->backing->bs->filename: ' + + node['image']['backing-image']['filename'], + filters=[filter_testfiles, filter_imgfmt]) + else: + log('bs->backing: (none)') + + log('') + + +with iotests.FilePath('base.img') as base_img_path, \ + iotests.FilePath('top.img') as top_img_path, \ + iotests.VM() as vm: + + assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 + # Choose a funny way to describe the backing filename + assert qemu_img('create', '-f', iotests.imgfmt, '-b', + 'file:' + base_img_path, top_img_path) == 0 + + vm.launch() + + log('--- Implicit backing file ---') + log('') + + vm.qmp_log('blockdev-add', + node_name='node0', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': top_img_path + }, + filters=[filter_testfiles, filter_imgfmt]) + + # Filename should be plain, and the backing filename should not + # contain the "file:" prefix + log_node_info(vm.node_info('node0')) + + vm.qmp_log('blockdev-del', node_name='node0') + + log('') + log('--- change-backing-file ---') + log('') + + vm.qmp_log('blockdev-add', + node_name='node0', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': top_img_path + }, + filters=[filter_testfiles, filter_imgfmt]) + + # Changing the backing file to a qemu-reported filename should + # result in qemu accepting the corresponding BDS as the implicit + # backing BDS (and thus not generate a json:{} filename). + # So, first, query the backing filename. + + backing_filename = \ + vm.node_info('node0')['image']['backing-image']['filename'] + + # Next, change the backing file to something different + + vm.qmp_log('change-backing-file', + image_node_name='node0', + device='node0', + backing_file='null-co://') + + # Now, verify that we get a json:{} filename + # (Image header says "null-co://", actual backing file still is + # base_img_path) + + log_node_info(vm.node_info('node0')) + + # Change it back + # (To get header and backing file in sync) + + vm.qmp_log('change-backing-file', + image_node_name='node0', + device='node0', + backing_file=backing_filename) + + # And verify that we get our original results + + log_node_info(vm.node_info('node0')) + + # Finally, try a "file:" prefix. While this is actually what we + # originally had in the image header, qemu will not reopen the + # backing file here, so it cannot verify that this filename + # "resolves" to the actual backing BDS's filename and will thus + # consider both to be different. + # (This may be fixed in the future.) + + vm.qmp_log('change-backing-file', + image_node_name='node0', + device='node0', + backing_file=('file:' + backing_filename)) + + # So now we should get a json:{} filename + + log_node_info(vm.node_info('node0')) + + # Remove and re-attach so we can see that (as in our first try), + # opening the image anew helps qemu resolve the header backing + # filename. + + vm.qmp_log('blockdev-del', node_name='node0') + + vm.qmp_log('blockdev-add', + node_name='node0', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': top_img_path + }, + filters=[filter_testfiles, filter_imgfmt]) + + log_node_info(vm.node_info('node0')) + + vm.qmp_log('blockdev-del', node_name='node0') + + log('') + log('--- Override backing file ---') + log('') + + # For this test, we need the plain filename in the image header + # (because qemu cannot "canonicalize"/"resolve" the backing + # filename unless the backing file is opened implicitly with the + # overlay) + assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, + top_img_path) == 0 + + # You can only reliably override backing options by using a node + # reference (or by specifying file.filename, but, well...) + vm.qmp_log('blockdev-add', node_name='null', driver='null-co') + + vm.qmp_log('blockdev-add', + node_name='node0', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': top_img_path + }, + backing='null', + filters=[filter_testfiles, filter_imgfmt]) + + # Should get a json:{} filename (and bs->backing_file is + # null-co://, because that field actually has not much to do + # with the header backing filename (except that it is changed by + # change-backing-file)) + + log_node_info(vm.node_info('node0')) + + # Detach the backing file by reopening the whole thing + + vm.qmp_log('blockdev-del', node_name='node0') + vm.qmp_log('blockdev-del', node_name='null') + + vm.qmp_log('blockdev-add', + node_name='node0', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': top_img_path + }, + backing=None, + filters=[filter_testfiles, filter_imgfmt]) + + # Should get a json:{} filename (because we overrode the backing + # file to not be there) + + log_node_info(vm.node_info('node0')) + + # Open the original backing file + + vm.qmp_log('blockdev-add', + node_name='original-backing', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': base_img_path + }, + filters=[filter_testfiles, filter_imgfmt]) + + # Attach the original backing file to its overlay + + vm.qmp_log('blockdev-snapshot', + node='original-backing', + overlay='node0') + + # This should give us the original plain result + + log_node_info(vm.node_info('node0')) + + vm.qmp_log('blockdev-del', node_name='node0') + vm.qmp_log('blockdev-del', node_name='original-backing') + + vm.shutdown()
tests/qemu-iotests/228.out new file +84 -0
84 lines not on this page · raw message
tests/qemu-iotests/group +1 -0
@@ -227,6 +227,7 @@ 225 rw auto quick 226 auto quick 227 auto quick +228 rw auto quick 229 auto quick 231 auto quick 232 auto quick
Signature · 1 line
2.19.2
PATCH v12 9/31 block: Make path_combine() return the path
In reply to Max ReitzBesides being safe for arbitrary path lengths, after some follow-up patches all callers will want a freshly allocated buffer anyway.
In the meantime, path_combine_deprecated() is added which has the same interface as path_combine() had before this patch. All callers to that function will be converted in follow-up patches.
--- include/block/block.h | 4 +- block.c | 85 ++++++++++++++++++++++++------------------- block/vmdk.c | 3 +- 3 files changed, 49 insertions(+), 43 deletions(-)
include/block/block.h +1 -3
@@ -494,9 +494,7 @@ void bdrv_get_full_backing_filename_from_filename(const char *backed,int path_has_protocol (const char *path);int path_is_absolute (const char *path); -void path_combine (char *dest,int dest_size, -const char *base_path, -const char *filename); +char *path_combine (const char *base_path,const char *filename);int bdrv_readv_vmstate (BlockDriverState *bs,QEMUIOVector *qiov,int64_t pos);int bdrv_writev_vmstate (BlockDriverState *bs,QEMUIOVector *qiov,int64_t pos);
block.c +47 -38
123 lines not on this page · raw message
block/vmdk.c +1 -2
@@ -873,8 +873,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,return -EINVAL ; } - extent_path =g_malloc0 (PATH_MAX ); -path_combine (extent_path,PATH_MAX , desc_file_path, fname); + extent_path =path_combine (desc_file_path, fname); ret =snprintf (extent_opt_prefix,32 ,"extents.%d" , s->num_extents);assert (ret <32 );
Signature · 1 line
2.19.2
PATCH v12 10/31 block: bdrv_get_full_backing_filename_from_...'s ret. val.
In reply to Max ReitzMake bdrv_get_full_backing_filename_from_filename() return an allocated string instead of placing the result in a caller-provided buffer.
--- include/block/block.h | 7 +++--- block.c | 53 ++++++++++++++++++++++++++++++------------- block/vmdk.c | 9 ++++---- qemu-img.c | 12 ++++------ 4 files changed, 48 insertions(+), 33 deletions(-)
include/block/block.h +3 -4
@@ -487,10 +487,9 @@ void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size);void bdrv_get_full_backing_filename (BlockDriverState *bs,char *dest,size_t sz,Error **errp); -void bdrv_get_full_backing_filename_from_filename (const char *backed, -const char *backing, -char *dest,size_t sz, -Error **errp); +char *bdrv_get_full_backing_filename_from_filename (const char *backed, +const char *backing, +Error **errp);int path_has_protocol (const char *path);int path_is_absolute (const char *path);
block.c +37 -16
86 lines not on this page · raw message
block/vmdk.c +4 -5
@@ -2049,16 +2049,15 @@ static int coroutine_fn vmdk_co_create_opts(const char *filename, QemuOpts *opts }if (backing_file) {BlockBackend *blk; -char *full_backing =g_new0 (char,PATH_MAX ); -bdrv_get_full_backing_filename_from_filename (filename, backing_file, - full_backing,PATH_MAX , - &local_err); +char *full_backing = +bdrv_get_full_backing_filename_from_filename (filename, backing_file, + &local_err);if (local_err) { -g_free (full_backing);error_propagate (errp, local_err); ret = -ENOENT ; goto exit; } +assert (full_backing); blk =blk_new_open (full_backing,NULL ,NULL ,BDRV_O_NO_BACKING , errp);
qemu-img.c +4 -8
@@ -3336,18 +3336,14 @@ static int img_rebase(int argc, char **argv)bdrv_refresh_filename (bs); overlay_filename = bs->exact_filename[0 ] ? bs->exact_filename : bs->filename; - out_real_path =g_malloc (PATH_MAX ); - -bdrv_get_full_backing_filename_from_filename (overlay_filename, - out_baseimg, - out_real_path, -PATH_MAX , - &local_err); + out_real_path = +bdrv_get_full_backing_filename_from_filename (overlay_filename, + out_baseimg, + &local_err);if (local_err) {error_reportf_err (local_err,"Could not resolve backing filename: " ); ret =-1 ; -g_free (out_real_path); goto out; }
Signature · 1 line
2.19.2
PATCH v12 11/31 block: bdrv_get_full_backing_filename's ret. val.
In reply to Max ReitzMake bdrv_get_full_backing_filename() return an allocated string instead of placing the result in a caller-provided buffer.
--- include/block/block.h | 3 +-- block.c | 48 +++++++++++++++---------------------------- block/qapi.c | 12 ++--------- 3 files changed, 20 insertions(+), 43 deletions(-)
include/block/block.h +1 -2
@@ -485,8 +485,7 @@ void bdrv_round_to_clusters(BlockDriverState *bs,void bdrv_get_backing_filename (BlockDriverState *bs,char *filename,int filename_size); -void bdrv_get_full_backing_filename (BlockDriverState *bs, -char *dest,size_t sz,Error **errp); +char *bdrv_get_full_backing_filename (BlockDriverState *bs,Error **errp);char *bdrv_get_full_backing_filename_from_filename (const char *backed,const char *backing,Error **errp);
block.c +17 -31
104 lines not on this page · raw message
block/qapi.c +2 -10
@@ -291,18 +291,10 @@ void bdrv_query_image_info(BlockDriverState *bs, backing_filename = bs->backing_file;if (backing_filename[0 ] !='\0' ) { -char *backing_filename2 =g_malloc0 (PATH_MAX ); +char *backing_filename2; info->backing_filename =g_strdup (backing_filename); info->has_backing_filename = true; -bdrv_get_full_backing_filename (bs, backing_filename2,PATH_MAX , &err); -if (err) { -/* Can't reconstruct the full backing filename, so we must omit -* this field and apply a Best Effort to this query. */ -g_free (backing_filename2); - backing_filename2 =NULL ; -error_free (err); - err =NULL ; - } + backing_filename2 =bdrv_get_full_backing_filename (bs,NULL );/* Always report the full_backing_filename if present, even if it's the * same as backing_filename. That they are same is useful info. */
Signature · 1 line
2.19.2
PATCH v12 12/31 block: Add bdrv_make_absolute_filename()
In reply to Max ReitzThis is a general function for making a filename that is relative to a certain BDS absolute.
It calls bdrv_get_full_backing_filename_from_filename() for now, but that will be changed in a follow-up patch.
--- block.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
block.c +20 -7
@@ -338,16 +338,29 @@ char *bdrv_get_full_backing_filename_from_filename(const char *backed, } } -char *bdrv_get_full_backing_filename (BlockDriverState *bs,Error **errp) +/* +* If @filename is empty or NULL, this function returns NULL without +* setting @errp. In all other cases, NULL will only be returned with +* @errp set. +*/ +static char *bdrv_make_absolute_filename (BlockDriverState *relative_to, +const char *filename,Error **errp) { -char *backed; +char *bs_filename; -bdrv_refresh_filename (bs); +bdrv_refresh_filename (relative_to); + + bs_filename = relative_to->exact_filename[0 ] + ? relative_to->exact_filename + : relative_to->filename; - backed = bs->exact_filename[0 ] ? bs->exact_filename : bs->filename; -return bdrv_get_full_backing_filename_from_filename (backed, - bs->backing_file, - errp); +return bdrv_get_full_backing_filename_from_filename (bs_filename, + filename ?:"" , errp); +} + +char *bdrv_get_full_backing_filename (BlockDriverState *bs,Error **errp) +{ +return bdrv_make_absolute_filename (bs, bs->backing_file, errp); }void bdrv_register (BlockDriver *bdrv)
Signature · 1 line
2.19.2
PATCH v12 13/31 block: Fix bdrv_find_backing_image()
In reply to Max Reitzbdrv_find_backing_image() should use bdrv_get_full_backing_filename() or bdrv_make_absolute_filename() instead of trying to do what those functions do by itself.
path_combine_deprecated() can now be dropped, so let's do that.
--- block.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-)
block.c +10 -23
@@ -201,15 +201,6 @@ char *path_combine(const char *base_path, const char *filename)return result; } -static void path_combine_deprecated (char *dest,int dest_size, -const char *base_path, -const char *filename) -{ -char *combined =path_combine (base_path, filename); -pstrcpy (dest, dest_size, combined); -g_free (combined); -} -/* * Helper function for bdrv_parse_filename() implementations to remove optional * protocol prefixes (especially "file:") from a filename and for putting the
@@ -4442,13 +4433,9 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, filename_full =g_malloc (PATH_MAX ); backing_file_full =g_malloc (PATH_MAX ); - filename_tmp =g_malloc (PATH_MAX ); is_protocol =path_has_protocol (backing_file); -/* This will recursively refresh everything in the backing chain */ -bdrv_refresh_filename (bs); -for (curr_bs = bs; curr_bs->backing; curr_bs = curr_bs->backing->bs) {/* If either of the filename paths is actually a protocol, then
@@ -4474,22 +4461,23 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, }else {/* If not an absolute filename path, make it relative to the current * image's filename path */ -path_combine_deprecated (filename_tmp,PATH_MAX , curr_bs->filename, - backing_file); - -/* We are going to compare absolute pathnames */ -if (!realpath (filename_tmp, filename_full)) { + filename_tmp =bdrv_make_absolute_filename (curr_bs, backing_file, +NULL ); +/* We are going to compare canonicalized absolute pathnames */ +if (!filename_tmp || !realpath (filename_tmp, filename_full)) { +g_free (filename_tmp);continue ; } +g_free (filename_tmp);/* We need to make sure the backing filename we are comparing against * is relative to the current image filename (or absolute) */ -path_combine_deprecated (filename_tmp,PATH_MAX , curr_bs->filename, - curr_bs->backing_file); - -if (!realpath (filename_tmp, backing_file_full)) { + filename_tmp =bdrv_get_full_backing_filename (curr_bs,NULL ); +if (!filename_tmp || !realpath (filename_tmp, backing_file_full)) { +g_free (filename_tmp);continue ; } +g_free (filename_tmp);if (strcmp (backing_file_full, filename_full) ==0 ) { retval = curr_bs->backing->bs;
@@ -4500,7 +4488,6 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,g_free (filename_full);g_free (backing_file_full); -g_free (filename_tmp);return retval; }
Signature · 1 line
2.19.2
PATCH v12 14/31 block: Add bdrv_dirname()
In reply to Max ReitzThis function may be implemented by block drivers to derive a directory name from a BDS. Concatenating this g_free()-able string with a relative filename must result in a valid (not necessarily existing) filename, so this is a function that should generally be not implemented by format drivers, because this is protocol-specific.
If a BDS's driver does not implement this function, bdrv_dirname() will fall through to the BDS's file if it exists. If it does not, the exact_filename field will be used to generate a directory name.
--- include/block/block.h | 1 + include/block/block_int.h | 7 +++++++ block.c | 27 +++++++++++++++++++++++++++ 3 files changed, 35 insertions(+)
include/block/block.h +1 -0
@@ -489,6 +489,7 @@ char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);char *bdrv_get_full_backing_filename_from_filename (const char *backed,const char *backing,Error **errp); +char *bdrv_dirname (BlockDriverState *bs,Error **errp);int path_has_protocol (const char *path);int path_is_absolute (const char *path);
include/block/block_int.h +7 -0
@@ -141,6 +141,13 @@ struct BlockDriver {void (*bdrv_refresh_filename)(BlockDriverState *bs,QDict *options); +/* +* Returns an allocated string which is the directory name of this BDS: It +* will be used to make relative filenames absolute by prepending this +* function's return value to them. +*/ +char *(*bdrv_dirname)(BlockDriverState *bs,Error **errp); +/* aio */ BlockAIOCB *(*bdrv_aio_preadv)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags,
block.c +27 -0
@@ -5497,6 +5497,33 @@ void bdrv_refresh_filename(BlockDriverState *bs) } } +char *bdrv_dirname (BlockDriverState *bs,Error **errp) +{ +BlockDriver *drv = bs->drv; + +if (!drv) { +error_setg (errp,"Node '%s' is ejected" , bs->node_name); +return NULL ; + } + +if (drv->bdrv_dirname) { +return drv->bdrv_dirname (bs, errp); + } + +if (bs->file) { +return bdrv_dirname (bs->file->bs, errp); + } + +bdrv_refresh_filename (bs); +if (bs->exact_filename[0 ] !='\0' ) { +return path_combine (bs->exact_filename,"" ); + } + +error_setg (errp,"Cannot generate a base directory for %s nodes" , + drv->format_name); +return NULL ; +} +/* * Hot add/remove a BDS's child. So the user can take a child offline when * it is broken and take a new child online
Signature · 1 line
2.19.2
PATCH v12 15/31 blkverify: Make bdrv_dirname() return NULL
In reply to Max Reitzblkverify's BDSs have a file BDS, but we do not want this to be preferred over the raw node. There is no way to decide between the two (and not really a reason to, either), so just return NULL in blkverify's implementation of bdrv_dirname().
--- block/blkverify.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
block/blkverify.c +10 -0
@@ -313,6 +313,15 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options) } } +static char *blkverify_dirname (BlockDriverState *bs,Error **errp) +{ +/* In general, there are two BDSs with different dirnames below this one; +* so there is no unique dirname we could return (unless both are equal by +* chance). Therefore, to be consistent, just always return NULL. */ +error_setg (errp,"Cannot generate a base directory for blkverify nodes" ); +return NULL ; +} +static BlockDriver bdrv_blkverify = { .format_name ="blkverify" , .protocol_name ="blkverify" ,
@@ -324,6 +333,7 @@ static BlockDriver bdrv_blkverify = { .bdrv_child_perm = bdrv_filter_default_perms, .bdrv_getlength = blkverify_getlength, .bdrv_refresh_filename = blkverify_refresh_filename, + .bdrv_dirname = blkverify_dirname, .bdrv_co_preadv = blkverify_co_preadv, .bdrv_co_pwritev = blkverify_co_pwritev,
Signature · 1 line
2.19.2
PATCH v12 16/31 quorum: Make bdrv_dirname() return NULL
In reply to Max ReitzWhile the common implementation for bdrv_dirname() should return NULL for quorum BDSs already (because they do not have a file node and their exact_filename field should be empty), there is no reason not to make that explicit.
--- block/quorum.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
block/quorum.c +11 -0
@@ -1094,6 +1094,16 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static char *quorum_dirname (BlockDriverState *bs,Error **errp) +{ +/* In general, there are multiple BDSs with different dirnames below this +* one; so there is no unique dirname we could return (unless all are equal +* by chance, or there is only one). Therefore, to be consistent, just +* always return NULL. */ +error_setg (errp,"Cannot generate a base directory for quorum nodes" ); +return NULL ; +} +static BlockDriver bdrv_quorum = { .format_name ="quorum" ,
@@ -1102,6 +1112,7 @@ static BlockDriver bdrv_quorum = { .bdrv_open = quorum_open, .bdrv_close = quorum_close, .bdrv_refresh_filename = quorum_refresh_filename, + .bdrv_dirname = quorum_dirname, .bdrv_co_flush_to_disk = quorum_co_flush,
Signature · 1 line
2.19.2
PATCH v12 17/31 block/nbd: Make bdrv_dirname() return NULL
In reply to Max ReitzThe generic bdrv_dirname() implementation would be able to generate some form of directory name for many NBD nodes, but it would be always wrong. Therefore, we have to explicitly make it an error (until NBD has some form of specification for export paths, if it ever will).
--- block/nbd.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
block/nbd.c +13 -0
@@ -564,6 +564,16 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static char *nbd_dirname (BlockDriverState *bs,Error **errp) +{ +/* The generic bdrv_dirname() implementation is able to work out some +* directory name for NBD nodes, but that would be wrong. So far there is no +* specification for how "export paths" would work, so NBD does not have +* directory names. */ +error_setg (errp,"Cannot generate a base directory for NBD nodes" ); +return NULL ; +} +static BlockDriver bdrv_nbd = { .format_name ="nbd" , .protocol_name ="nbd" ,
@@ -582,6 +592,7 @@ static BlockDriver bdrv_nbd = { .bdrv_attach_aio_context = nbd_attach_aio_context, .bdrv_refresh_filename = nbd_refresh_filename, .bdrv_co_block_status = nbd_client_co_block_status, + .bdrv_dirname = nbd_dirname, };static BlockDriver bdrv_nbd_tcp = {
@@ -602,6 +613,7 @@ static BlockDriver bdrv_nbd_tcp = { .bdrv_attach_aio_context = nbd_attach_aio_context, .bdrv_refresh_filename = nbd_refresh_filename, .bdrv_co_block_status = nbd_client_co_block_status, + .bdrv_dirname = nbd_dirname, };static BlockDriver bdrv_nbd_unix = {
@@ -622,6 +634,7 @@ static BlockDriver bdrv_nbd_unix = { .bdrv_attach_aio_context = nbd_attach_aio_context, .bdrv_refresh_filename = nbd_refresh_filename, .bdrv_co_block_status = nbd_client_co_block_status, + .bdrv_dirname = nbd_dirname, };static void bdrv_nbd_init (void )
Signature · 1 line
2.19.2
PATCH v12 18/31 block/nfs: Implement bdrv_dirname()
In reply to Max ReitzWhile the basic idea is obvious and could be handled by the default bdrv_dirname() implementation, we cannot generate a directory name if the gid or uid are set, so we have to explicitly return NULL in those cases.
--- block/nfs.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
block/nfs.c +15 -0
@@ -855,6 +855,20 @@ static void nfs_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static char *nfs_dirname (BlockDriverState *bs,Error **errp) +{ +NFSClient *client = bs->opaque; + +if (client->uid || client->gid) { +bdrv_refresh_filename (bs); +error_setg (errp,"Cannot generate a base directory for NFS node '%s'" , + bs->filename); +return NULL ; + } + +return g_strdup_printf ("nfs://%s%s/" , client->server->host, client->path); +} +#ifdef LIBNFS_FEATURE_PAGECACHE static void coroutine_fn nfs_co_invalidate_cache(BlockDriverState *bs, Error **errp)
@@ -889,6 +903,7 @@ static BlockDriver bdrv_nfs = { .bdrv_detach_aio_context = nfs_detach_aio_context, .bdrv_attach_aio_context = nfs_attach_aio_context, .bdrv_refresh_filename = nfs_refresh_filename, + .bdrv_dirname = nfs_dirname, #ifdef LIBNFS_FEATURE_PAGECACHE .bdrv_co_invalidate_cache = nfs_co_invalidate_cache,
Signature · 1 line
2.19.2
PATCH v12 19/31 block: Use bdrv_dirname() for relative filenames
In reply to Max Reitzbdrv_get_full_backing_filename_from_filename() breaks down when it comes to JSON filenames. Using bdrv_dirname() as the basis is better because since we have BDS, we can descend through the BDS tree to the protocol layer, which gives us a greater probability of finding a non-JSON name; also, bdrv_dirname() is more correct as it allows block drivers to override the generation of that directory name in a protocol-specific way.
We still need to keep bdrv_get_full_backing_filename_from_filename(), though, because it has valid callers which need it during image creation when no BDS is available yet.
This makes a test case in qemu-iotest 110, which was supposed to fail, work. That is actually good, but we need to change the reference output (and the comment in 110) accordingly.
--- block.c | 20 +++++++++++++------- tests/qemu-iotests/110 | 3 ++- tests/qemu-iotests/110.out | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-)
block.c +13 -7
@@ -337,16 +337,22 @@ char *bdrv_get_full_backing_filename_from_filename(const char *backed,static char *bdrv_make_absolute_filename (BlockDriverState *relative_to,const char *filename,Error **errp) { -char *bs_filename; +char *dir, *full_name; -bdrv_refresh_filename (relative_to); +if (!filename || filename[0 ] =='\0' ) { +return NULL ; + }else if (path_has_protocol (filename) ||path_is_absolute (filename)) { +return g_strdup (filename); + } - bs_filename = relative_to->exact_filename[0 ] - ? relative_to->exact_filename - : relative_to->filename; + dir =bdrv_dirname (relative_to, errp); +if (!dir) { +return NULL ; + } -return bdrv_get_full_backing_filename_from_filename (bs_filename, - filename ?:"" , errp); + full_name =g_strconcat (dir, filename,NULL ); +g_free (dir); +return full_name; }char *bdrv_get_full_backing_filename (BlockDriverState *bs,Error **errp)
tests/qemu-iotests/110 +2 -1
@@ -60,7 +60,8 @@ echo '=== Non-reconstructable filename ===' echo # Across blkdebug without a config file, you cannot reconstruct filenames, so -# qemu is incapable of knowing the directory of the top image +# qemu is incapable of knowing the directory of the top image from the filename +# alone. However, using bdrv_dirname(), it should still work. TEST_IMG="json:{ 'driver': '$IMGFMT', 'file': {
tests/qemu-iotests/110.out +1 -1
@@ -14,7 +14,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}} file format: IMGFMT virtual size: 64M (67108864 bytes) -backing file: t.IMGFMT.base (cannot determine actual path) +backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) === Backing name is always relative to the backed image ===
Signature · 1 line
2.19.2
PATCH v12 20/31 iotests: Add quorum case to test 110
In reply to Max ReitzTest 110 tests relative backing filenames for complex BDS trees. Now that the originally supposedly failing test passes, let us add a new failing test: Quorum can never work automatically (without detecting whether all child nodes have the same base directory, but that would be rather inconsistent behavior).
--- tests/qemu-iotests/110 | 26 ++++++++++++++++++++++++++ tests/qemu-iotests/110.out | 7 +++++++ 2 files changed, 33 insertions(+)
tests/qemu-iotests/110 +26 -0
@@ -29,6 +29,7 @@ status=1 # failure is the default! _cleanup() { _cleanup_test_img + rm -f "$TEST_IMG.copy" } trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -86,6 +87,31 @@ echo # omit the image size; it should work anyway _make_test_img -b "$TEST_IMG_REL.base" +echo +echo '=== Nodes without a common directory ===' +echo + +cp "$TEST_IMG" "$TEST_IMG.copy" + +# Should inform us that the actual path of the backing file cannot be determined +TEST_IMG="json:{ + 'driver': '$IMGFMT', + 'file': { + 'driver': 'quorum', + 'vote-threshold': 1, + 'children': [ + { + 'driver': 'file', + 'filename': '$TEST_IMG' + }, + { + 'driver': 'file', + 'filename': '$TEST_IMG.copy' + } + ] + } +}" _img_info | _filter_img_info + # success, all done echo '*** done'
tests/qemu-iotests/110.out +7 -0
@@ -19,4 +19,11 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) === Backing name is always relative to the backed image === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.base + +=== Nodes without a common directory === + +image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "blkverify": false, "rewrite-corrupted": false, "vote-threshold": 1}} +file format: IMGFMT +virtual size: 64M (67108864 bytes) +backing file: t.IMGFMT.base (cannot determine actual path) *** done
Signature · 1 line
2.19.2
PATCH v12 21/31 block: Add strong_runtime_opts to BlockDriver
In reply to Max ReitzThis new field can be set by block drivers to list the runtime options they accept that may influence the contents of the respective BDS. As of a follow-up patch, this list will be used by the common bdrv_refresh_filename() implementation to decide which options to put into BDS.full_open_options (and consequently whether a JSON filename has to be created), thus freeing the drivers of having to implement that logic themselves.
Additionally, this patch adds the field to all of the block drivers that need it and sets it accordingly.
--- include/block/block_int.h | 7 +++++++ block/blkdebug.c | 16 ++++++++++++++++ block/blklogwrites.c | 8 ++++++++ block/crypto.c | 8 ++++++++ block/curl.c | 21 +++++++++++++++++++++ block/gluster.c | 19 +++++++++++++++++++ block/iscsi.c | 18 ++++++++++++++++++ block/nbd.c | 14 ++++++++++++++ block/nfs.c | 11 +++++++++++ block/null.c | 9 +++++++++ block/nvme.c | 8 ++++++++ block/qcow.c | 7 +++++++ block/qcow2.c | 7 +++++++ block/quorum.c | 11 +++++++++++ block/raw-format.c | 10 +++++++++- block/rbd.c | 14 ++++++++++++++ block/replication.c | 8 ++++++++ block/sheepdog.c | 12 ++++++++++++ block/ssh.c | 12 ++++++++++++ block/throttle.c | 7 +++++++ block/vpc.c | 7 +++++++ block/vvfat.c | 12 ++++++++++++ block/vxhs.c | 11 +++++++++++ 23 files changed, 256 insertions(+), 1 deletion(-)
include/block/block_int.h +7 -0
@@ -516,6 +516,13 @@ struct BlockDriver {void (*bdrv_register_buf)(BlockDriverState *bs,void *host,size_t size);void (*bdrv_unregister_buf)(BlockDriverState *bs,void *host);QLIST_ENTRY (BlockDriver) list; + +/* Pointer to a NULL-terminated array of names of strong options +* that can be specified for bdrv_open(). A strong option is one +* that changes the data of a BDS. +* If this pointer is NULL, the array is considered empty. +* "filename" and "driver" are always considered strong. */ +const char *const *strong_runtime_opts; }; typedef struct BlockLimits {
block/blkdebug.c +16 -0
@@ -888,6 +888,20 @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,return 0 ; } +static const char *const blkdebug_strong_runtime_opts[] = { +"config" , +"inject-error." , +"set-state." , +"align" , +"max-transfer" , +"opt-write-zero" , +"max-write-zero" , +"opt-discard" , +"max-discard" , + +NULL +}; +static BlockDriver bdrv_blkdebug = { .format_name ="blkdebug" , .protocol_name ="blkdebug" ,
@@ -917,6 +931,8 @@ static BlockDriver bdrv_blkdebug = { = blkdebug_debug_remove_breakpoint, .bdrv_debug_resume = blkdebug_debug_resume, .bdrv_debug_is_suspended = blkdebug_debug_is_suspended, + + .strong_runtime_opts = blkdebug_strong_runtime_opts, };static void bdrv_blkdebug_init (void )
block/blklogwrites.c +8 -0
@@ -518,6 +518,13 @@ blk_log_writes_co_pdiscard(BlockDriverState *bs, int64_t offset, int count) LOG_DISCARD_FLAG, false); } +static const char *const blk_log_writes_strong_runtime_opts[] = { +"log-append" , +"log-sector-size" , + +NULL +}; +static BlockDriver bdrv_blk_log_writes = { .format_name ="blklogwrites" , .instance_size =sizeof (BDRVBlkLogWritesState),
@@ -537,6 +544,7 @@ static BlockDriver bdrv_blk_log_writes = { .bdrv_co_block_status = bdrv_co_block_status_from_file, .is_filter = true, + .strong_runtime_opts = blk_log_writes_strong_runtime_opts, };static void bdrv_blk_log_writes_init (void )
block/crypto.c +8 -0
@@ -622,6 +622,12 @@ block_crypto_get_specific_info_luks(BlockDriverState *bs)return spec_info; } +static const char *const block_crypto_strong_runtime_opts[] = { +BLOCK_CRYPTO_OPT_LUKS_KEY_SECRET , + +NULL +}; +BlockDriver bdrv_crypto_luks = { .format_name ="luks" , .instance_size =sizeof (BlockCrypto),
@@ -643,6 +649,8 @@ BlockDriver bdrv_crypto_luks = { .bdrv_getlength = block_crypto_getlength, .bdrv_get_info = block_crypto_get_info_luks, .bdrv_get_specific_info = block_crypto_get_specific_info_luks, + + .strong_runtime_opts = block_crypto_strong_runtime_opts, };static void block_crypto_init (void )
block/curl.c +21 -0
@@ -960,6 +960,19 @@ static int64_t curl_getlength(BlockDriverState *bs)return s->len; } +static const char *const curl_strong_runtime_opts[] = { +CURL_BLOCK_OPT_URL , +CURL_BLOCK_OPT_SSLVERIFY , +CURL_BLOCK_OPT_COOKIE , +CURL_BLOCK_OPT_COOKIE_SECRET , +CURL_BLOCK_OPT_USERNAME , +CURL_BLOCK_OPT_PASSWORD_SECRET , +CURL_BLOCK_OPT_PROXY_USERNAME , +CURL_BLOCK_OPT_PROXY_PASSWORD_SECRET , + +NULL +}; +static BlockDriver bdrv_http = { .format_name ="http" , .protocol_name ="http" ,
@@ -974,6 +987,8 @@ static BlockDriver bdrv_http = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + + .strong_runtime_opts = curl_strong_runtime_opts, };static BlockDriver bdrv_https = {
@@ -990,6 +1005,8 @@ static BlockDriver bdrv_https = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + + .strong_runtime_opts = curl_strong_runtime_opts, };static BlockDriver bdrv_ftp = {
@@ -1006,6 +1023,8 @@ static BlockDriver bdrv_ftp = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + + .strong_runtime_opts = curl_strong_runtime_opts, };static BlockDriver bdrv_ftps = {
@@ -1022,6 +1041,8 @@ static BlockDriver bdrv_ftps = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + + .strong_runtime_opts = curl_strong_runtime_opts, };static void curl_block_init (void )
block/gluster.c +19 -0
@@ -1495,6 +1495,21 @@ static int coroutine_fn qemu_gluster_co_block_status(BlockDriverState *bs, } +static const char *const gluster_strong_open_opts[] = { +GLUSTER_OPT_VOLUME , +GLUSTER_OPT_PATH , +GLUSTER_OPT_TYPE , +GLUSTER_OPT_SERVER_PATTERN , +GLUSTER_OPT_HOST , +GLUSTER_OPT_PORT , +GLUSTER_OPT_TO , +GLUSTER_OPT_IPV4 , +GLUSTER_OPT_IPV6 , +GLUSTER_OPT_SOCKET , + +NULL +}; +static BlockDriver bdrv_gluster = { .format_name ="gluster" , .protocol_name ="gluster" ,
@@ -1522,6 +1537,7 @@ static BlockDriver bdrv_gluster = {#endif .bdrv_co_block_status = qemu_gluster_co_block_status, .create_opts = &qemu_gluster_create_opts, + .strong_runtime_opts = gluster_strong_open_opts, };static BlockDriver bdrv_gluster_tcp = {
@@ -1551,6 +1567,7 @@ static BlockDriver bdrv_gluster_tcp = {#endif .bdrv_co_block_status = qemu_gluster_co_block_status, .create_opts = &qemu_gluster_create_opts, + .strong_runtime_opts = gluster_strong_open_opts, };static BlockDriver bdrv_gluster_unix = {
@@ -1580,6 +1597,7 @@ static BlockDriver bdrv_gluster_unix = {#endif .bdrv_co_block_status = qemu_gluster_co_block_status, .create_opts = &qemu_gluster_create_opts, + .strong_runtime_opts = gluster_strong_open_opts, };/* rdma is deprecated (actually never supported for volfile fetch).
@@ -1615,6 +1633,7 @@ static BlockDriver bdrv_gluster_rdma = {#endif .bdrv_co_block_status = qemu_gluster_co_block_status, .create_opts = &qemu_gluster_create_opts, + .strong_runtime_opts = gluster_strong_open_opts, };static void bdrv_gluster_init (void )
block/iscsi.c +18 -0
@@ -2423,6 +2423,20 @@ static QemuOptsList iscsi_create_opts = { } }; +static const char *const iscsi_strong_runtime_opts[] = { +"transport" , +"portal" , +"target" , +"user" , +"password" , +"password-secret" , +"lun" , +"initiator-name" , +"header-digest" , + +NULL +}; +static BlockDriver bdrv_iscsi = { .format_name ="iscsi" , .protocol_name ="iscsi" ,
@@ -2457,6 +2471,8 @@ static BlockDriver bdrv_iscsi = { .bdrv_detach_aio_context = iscsi_detach_aio_context, .bdrv_attach_aio_context = iscsi_attach_aio_context, + + .strong_runtime_opts = iscsi_strong_runtime_opts, };#if LIBISCSI_API_VERSION >= (20160603 )
@@ -2494,6 +2510,8 @@ static BlockDriver bdrv_iser = { .bdrv_detach_aio_context = iscsi_detach_aio_context, .bdrv_attach_aio_context = iscsi_attach_aio_context, + + .strong_runtime_opts = iscsi_strong_runtime_opts, };#endif
block/nbd.c +14 -0
@@ -574,6 +574,17 @@ static char *nbd_dirname(BlockDriverState *bs, Error **errp)return NULL ; } +static const char *const nbd_strong_runtime_opts[] = { +"path" , +"host" , +"port" , +"export" , +"tls-creds" , +"server." , + +NULL +}; +static BlockDriver bdrv_nbd = { .format_name ="nbd" , .protocol_name ="nbd" ,
@@ -593,6 +604,7 @@ static BlockDriver bdrv_nbd = { .bdrv_refresh_filename = nbd_refresh_filename, .bdrv_co_block_status = nbd_client_co_block_status, .bdrv_dirname = nbd_dirname, + .strong_runtime_opts = nbd_strong_runtime_opts, };static BlockDriver bdrv_nbd_tcp = {
@@ -614,6 +626,7 @@ static BlockDriver bdrv_nbd_tcp = { .bdrv_refresh_filename = nbd_refresh_filename, .bdrv_co_block_status = nbd_client_co_block_status, .bdrv_dirname = nbd_dirname, + .strong_runtime_opts = nbd_strong_runtime_opts, };static BlockDriver bdrv_nbd_unix = {
@@ -635,6 +648,7 @@ static BlockDriver bdrv_nbd_unix = { .bdrv_refresh_filename = nbd_refresh_filename, .bdrv_co_block_status = nbd_client_co_block_status, .bdrv_dirname = nbd_dirname, + .strong_runtime_opts = nbd_strong_runtime_opts, };static void bdrv_nbd_init (void )
block/nfs.c +11 -0
@@ -878,6 +878,15 @@ static void coroutine_fn nfs_co_invalidate_cache(BlockDriverState *bs, }#endif +static const char *nfs_strong_runtime_opts[] = { +"path" , +"user" , +"group" , +"server." , + +NULL +}; +static BlockDriver bdrv_nfs = { .format_name ="nfs" , .protocol_name ="nfs" ,
@@ -905,6 +914,8 @@ static BlockDriver bdrv_nfs = { .bdrv_refresh_filename = nfs_refresh_filename, .bdrv_dirname = nfs_dirname, + .strong_runtime_opts = nfs_strong_runtime_opts, + #ifdef LIBNFS_FEATURE_PAGECACHE .bdrv_co_invalidate_cache = nfs_co_invalidate_cache, #endif
block/null.c +9 -0
@@ -252,6 +252,13 @@ static void null_refresh_filename(BlockDriverState *bs, QDict *opts) bs->full_open_options =qobject_ref (opts); } +static const char *const null_strong_runtime_opts[] = { +BLOCK_OPT_SIZE , +NULL_OPT_ZEROES , + +NULL +}; +static BlockDriver bdrv_null_co = { .format_name ="null-co" , .protocol_name ="null-co" ,
@@ -269,6 +276,7 @@ static BlockDriver bdrv_null_co = { .bdrv_co_block_status = null_co_block_status, .bdrv_refresh_filename = null_refresh_filename, + .strong_runtime_opts = null_strong_runtime_opts, };static BlockDriver bdrv_null_aio = {
@@ -288,6 +296,7 @@ static BlockDriver bdrv_null_aio = { .bdrv_co_block_status = null_co_block_status, .bdrv_refresh_filename = null_refresh_filename, + .strong_runtime_opts = null_strong_runtime_opts, };static void bdrv_null_init (void )
block/nvme.c +8 -0
@@ -1139,6 +1139,13 @@ static void nvme_unregister_buf(BlockDriverState *bs, void *host)qemu_vfio_dma_unmap (s->vfio, host); } +static const char *const nvme_strong_runtime_opts[] = { +NVME_BLOCK_OPT_DEVICE , +NVME_BLOCK_OPT_NAMESPACE , + +NULL +}; +static BlockDriver bdrv_nvme = { .format_name ="nvme" , .protocol_name ="nvme" ,
@@ -1156,6 +1163,7 @@ static BlockDriver bdrv_nvme = { .bdrv_refresh_filename = nvme_refresh_filename, .bdrv_refresh_limits = nvme_refresh_limits, + .strong_runtime_opts = nvme_strong_runtime_opts, .bdrv_detach_aio_context = nvme_detach_aio_context, .bdrv_attach_aio_context = nvme_attach_aio_context,
block/qcow.c +7 -0
@@ -1186,6 +1186,12 @@ static QemuOptsList qcow_create_opts = { } }; +static const char *const qcow_strong_runtime_opts[] = { +"encrypt." BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET , + +NULL +}; +static BlockDriver bdrv_qcow = { .format_name ="qcow" , .instance_size =sizeof (BDRVQcowState),
@@ -1209,6 +1215,7 @@ static BlockDriver bdrv_qcow = { .bdrv_get_info = qcow_get_info, .create_opts = &qcow_create_opts, + .strong_runtime_opts = qcow_strong_runtime_opts, };static void bdrv_qcow_init (void )
block/qcow2.c +7 -0
@@ -4920,6 +4920,12 @@ static QemuOptsList qcow2_create_opts = { } }; +static const char *const qcow2_strong_runtime_opts[] = { +"encrypt." BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET , + +NULL +}; +BlockDriver bdrv_qcow2 = { .format_name ="qcow2" , .instance_size =sizeof (BDRVQcow2State),
@@ -4968,6 +4974,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_inactivate = qcow2_inactivate, .create_opts = &qcow2_create_opts, + .strong_runtime_opts = qcow2_strong_runtime_opts, .bdrv_co_check = qcow2_co_check, .bdrv_amend_options = qcow2_amend_options,
block/quorum.c +11 -0
@@ -1104,6 +1104,15 @@ static char *quorum_dirname(BlockDriverState *bs, Error **errp)return NULL ; } +static const char *const quorum_strong_runtime_opts[] = { +QUORUM_OPT_VOTE_THRESHOLD , +QUORUM_OPT_BLKVERIFY , +QUORUM_OPT_REWRITE , +QUORUM_OPT_READ_PATTERN , + +NULL +}; +static BlockDriver bdrv_quorum = { .format_name ="quorum" ,
@@ -1128,6 +1137,8 @@ static BlockDriver bdrv_quorum = { .is_filter = true, .bdrv_recurse_is_first_non_filter = quorum_recurse_is_first_non_filter, + + .strong_runtime_opts = quorum_strong_runtime_opts, };static void bdrv_quorum_init (void )
block/raw-format.c +9 -1
@@ -532,6 +532,13 @@ static int coroutine_fn raw_co_copy_range_to(BlockDriverState *bs, read_flags, write_flags); } +static const char *const raw_strong_runtime_opts[] = { +"offset" , +"size" , + +NULL +}; +BlockDriver bdrv_raw = { .format_name ="raw" , .instance_size =sizeof (BDRVRawState),
@@ -561,7 +568,8 @@ BlockDriver bdrv_raw = { .bdrv_lock_medium = &raw_lock_medium, .bdrv_co_ioctl = &raw_co_ioctl, .create_opts = &raw_create_opts, - .bdrv_has_zero_init = &raw_has_zero_init + .bdrv_has_zero_init = &raw_has_zero_init, + .strong_runtime_opts = raw_strong_runtime_opts, };static void bdrv_raw_init (void )
block/rbd.c +14 -0
@@ -1228,6 +1228,18 @@ static QemuOptsList qemu_rbd_create_opts = { } }; +static const char *const qemu_rbd_strong_runtime_opts[] = { +"pool" , +"image" , +"conf" , +"snapshot" , +"user" , +"server." , +"password-secret" , + +NULL +}; +static BlockDriver bdrv_rbd = { .format_name ="rbd" , .instance_size =sizeof (BDRVRBDState),
@@ -1265,6 +1277,8 @@ static BlockDriver bdrv_rbd = {#ifdef LIBRBD_SUPPORTS_INVALIDATE .bdrv_co_invalidate_cache = qemu_rbd_co_invalidate_cache, #endif + + .strong_runtime_opts = qemu_rbd_strong_runtime_opts, };static void bdrv_rbd_init (void )
block/replication.c +8 -0
@@ -676,6 +676,13 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp)aio_context_release (aio_context); } +static const char *const replication_strong_runtime_opts[] = { +REPLICATION_MODE , +REPLICATION_TOP_ID , + +NULL +}; +BlockDriver bdrv_replication = { .format_name ="replication" , .instance_size =sizeof (BDRVReplicationState),
@@ -692,6 +699,7 @@ BlockDriver bdrv_replication = { .bdrv_recurse_is_first_non_filter = replication_recurse_is_first_non_filter, .has_variable_length = true, + .strong_runtime_opts = replication_strong_runtime_opts, };static void bdrv_replication_init (void )
block/sheepdog.c +12 -0
@@ -3216,6 +3216,15 @@ static QemuOptsList sd_create_opts = { } }; +static const char *const sd_strong_runtime_opts[] = { +"vdi" , +"snap-id" , +"tag" , +"server." , + +NULL +}; +static BlockDriver bdrv_sheepdog = { .format_name ="sheepdog" , .protocol_name ="sheepdog" ,
@@ -3251,6 +3260,7 @@ static BlockDriver bdrv_sheepdog = { .bdrv_attach_aio_context = sd_attach_aio_context, .create_opts = &sd_create_opts, + .strong_runtime_opts = sd_strong_runtime_opts, };static BlockDriver bdrv_sheepdog_tcp = {
@@ -3288,6 +3298,7 @@ static BlockDriver bdrv_sheepdog_tcp = { .bdrv_attach_aio_context = sd_attach_aio_context, .create_opts = &sd_create_opts, + .strong_runtime_opts = sd_strong_runtime_opts, };static BlockDriver bdrv_sheepdog_unix = {
@@ -3325,6 +3336,7 @@ static BlockDriver bdrv_sheepdog_unix = { .bdrv_attach_aio_context = sd_attach_aio_context, .create_opts = &sd_create_opts, + .strong_runtime_opts = sd_strong_runtime_opts, };static void bdrv_sheepdog_init (void )
block/ssh.c +12 -0
@@ -1266,6 +1266,17 @@ static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,return ssh_grow_file (s, offset, errp); } +static const char *const ssh_strong_runtime_opts[] = { +"host" , +"port" , +"path" , +"user" , +"host_key_check" , +"server." , + +NULL +}; +static BlockDriver bdrv_ssh = { .format_name ="ssh" , .protocol_name ="ssh" ,
@@ -1282,6 +1293,7 @@ static BlockDriver bdrv_ssh = { .bdrv_co_truncate = ssh_co_truncate, .bdrv_co_flush_to_disk = ssh_co_flush, .create_opts = &ssh_create_opts, + .strong_runtime_opts = ssh_strong_runtime_opts, };static void bdrv_ssh_init (void )
block/throttle.c +7 -0
@@ -227,6 +227,12 @@ static void coroutine_fn throttle_co_drain_end(BlockDriverState *bs)atomic_dec (&tgm->io_limits_disabled); } +static const char *const throttle_strong_runtime_opts[] = { +QEMU_OPT_THROTTLE_GROUP_NAME , + +NULL +}; +static BlockDriver bdrv_throttle = { .format_name ="throttle" , .instance_size =sizeof (ThrottleGroupMember),
@@ -259,6 +265,7 @@ static BlockDriver bdrv_throttle = { .bdrv_co_drain_end = throttle_co_drain_end, .is_filter = true, + .strong_runtime_opts = throttle_strong_runtime_opts, };static void bdrv_throttle_init (void )
block/vpc.c +7 -0
@@ -1216,6 +1216,12 @@ static QemuOptsList vpc_create_opts = { } }; +static const char *const vpc_strong_runtime_opts[] = { +VPC_OPT_SIZE_CALC , + +NULL +}; +static BlockDriver bdrv_vpc = { .format_name ="vpc" , .instance_size =sizeof (BDRVVPCState),
@@ -1236,6 +1242,7 @@ static BlockDriver bdrv_vpc = { .create_opts = &vpc_create_opts, .bdrv_has_zero_init = vpc_has_zero_init, + .strong_runtime_opts = vpc_strong_runtime_opts, };static void bdrv_vpc_init (void )
block/vvfat.c +12 -0
@@ -3253,6 +3253,16 @@ static void vvfat_close(BlockDriverState *bs) } } +static const char *const vvfat_strong_runtime_opts[] = { +"dir" , +"fat-type" , +"floppy" , +"label" , +"rw" , + +NULL +}; +static BlockDriver bdrv_vvfat = { .format_name ="vvfat" , .protocol_name ="fat" ,
@@ -3267,6 +3277,8 @@ static BlockDriver bdrv_vvfat = { .bdrv_co_preadv = vvfat_co_preadv, .bdrv_co_pwritev = vvfat_co_pwritev, .bdrv_co_block_status = vvfat_co_block_status, + + .strong_runtime_opts = vvfat_strong_runtime_opts, };static void bdrv_vvfat_init (void )
block/vxhs.c +11 -0
@@ -556,6 +556,16 @@ static int64_t vxhs_getlength(BlockDriverState *bs)return vdisk_size; } +static const char *const vxhs_strong_runtime_opts[] = { +VXHS_OPT_VDISK_ID , +"tls-creds" , +VXHS_OPT_HOST , +VXHS_OPT_PORT , +VXHS_OPT_SERVER "." , + +NULL +}; +static BlockDriver bdrv_vxhs = { .format_name ="vxhs" , .protocol_name ="vxhs" ,
@@ -567,6 +577,7 @@ static BlockDriver bdrv_vxhs = { .bdrv_getlength = vxhs_getlength, .bdrv_aio_preadv = vxhs_aio_preadv, .bdrv_aio_pwritev = vxhs_aio_pwritev, + .strong_runtime_opts = vxhs_strong_runtime_opts, };static void bdrv_vxhs_init (void )
Signature · 1 line
2.19.2
PATCH v12 22/31 block: Add BlockDriver.bdrv_gather_child_options
In reply to Max ReitzSome follow-up patches will rework the way bs->full_open_options is refreshed in bdrv_refresh_filename(). The new implementation will remove the need for the block drivers' bdrv_refresh_filename() implementations to set bs->full_open_options; instead, it will be generic and use static information from each block driver.
However, by implementing bdrv_gather_child_options(), block drivers will still be able to override the way the full_open_options of their children are incorporated into their own.
We need to implement this function for VMDK because we have to prevent the generic implementation from gathering the options of all children:
It is not possible to specify options for the extents through the runtime options.
For quorum, the child names that would be used by the generic implementation and the ones that we actually (currently) want to use differ. See quorum_gather_child_options() for more information.
Note that both of these are cases which are not ideal: In case of VMDK it would probably be nice to be able to specify options for all extents. In case of quorum, the current runtime option structure is simply broken and needs to be fixed (but that is left for another patch).
--- include/block/block_int.h | 24 +++++++++++++++++++++++ block/quorum.c | 40 +++++++++++++++++++++++++++++++++++++++ block/vmdk.c | 19 +++++++++++++++++++ 3 files changed, 83 insertions(+)
include/block/block_int.h +24 -0
@@ -141,6 +141,30 @@ struct BlockDriver {void (*bdrv_refresh_filename)(BlockDriverState *bs,QDict *options); +/* +* Gathers the open options for all children into @target. +* A simple format driver (without backing file support) might +* implement this function like this: +* +* QINCREF(bs->file->bs->full_open_options); +* qdict_put(target, "file", bs->file->bs->full_open_options); +* +* If not specified, the generic implementation will simply put +* all children's options under their respective name. +* +* @backing_overridden is true when bs->backing seems not to be +* the child that would result from opening bs->backing_file. +* Therefore, if it is true, the backing child's options should be +* gathered; otherwise, there is no need since the backing child +* is the one implied by the image header. +* +* Note that ideally this function would not be needed. Every +* block driver which implements it is probably doing something +* shady regarding its runtime option structure. +*/ +void (*bdrv_gather_child_options)(BlockDriverState *bs,QDict *target, +bool backing_overridden); +/* * Returns an allocated string which is the directory name of this BDS: It * will be used to make relative filenames absolute by prepending this
block/quorum.c +40 -0
@@ -1094,6 +1094,45 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static void quorum_gather_child_options (BlockDriverState *bs,QDict *target, +bool backing_overridden) +{ +BDRVQuorumState *s = bs->opaque; +QList *children_list; +int i; + +/* +* The generic implementation for gathering child options in +* bdrv_refresh_filename() would use the names of the children +* as specified for bdrv_open_child() or bdrv_attach_child(), +* which is "children.%u" with %u being a value +* (s->next_child_index) that is incremented each time a new child +* is added (and never decremented). Since children can be +* deleted at runtime, there may be gaps in that enumeration. +* When creating a new quorum BDS and specifying the children for +* it through runtime options, the enumeration used there may not +* have any gaps, though. +* +* Therefore, we have to create a new gap-less enumeration here +* (which we can achieve by simply putting all of the children's +* full_open_options into a QList). +* +* XXX: Note that there are issues with the current child option +* structure quorum uses (such as the fact that children do +* not really have unique permanent names). Therefore, this +* is going to have to change in the future and ideally we +* want quorum to be covered by the generic implementation. +*/ + + children_list =qlist_new (); +qdict_put (target,"children" , children_list); + +for (i =0 ; i < s->num_children; i++) { +qlist_append (children_list, +qobject_ref (s->children[i]->bs->full_open_options)); + } +} +static char *quorum_dirname (BlockDriverState *bs,Error **errp) {/* In general, there are multiple BDSs with different dirnames below this
@@ -1121,6 +1160,7 @@ static BlockDriver bdrv_quorum = { .bdrv_open = quorum_open, .bdrv_close = quorum_close, .bdrv_refresh_filename = quorum_refresh_filename, + .bdrv_gather_child_options = quorum_gather_child_options, .bdrv_dirname = quorum_dirname, .bdrv_co_flush_to_disk = quorum_co_flush,
block/vmdk.c +19 -0
@@ -27,6 +27,7 @@#include "qapi/error.h" #include "block/block_int.h" #include "sysemu/block-backend.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/module.h"
@@ -2377,6 +2378,23 @@ static int vmdk_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)return 0 ; } +static void vmdk_gather_child_options (BlockDriverState *bs,QDict *target, +bool backing_overridden) +{ +/* No children but file and backing can be explicitly specified (TODO) */ +qdict_put (target,"file" , +qobject_ref (bs->file->bs->full_open_options)); + +if (backing_overridden) { +if (bs->backing) { +qdict_put (target,"backing" , +qobject_ref (bs->backing->bs->full_open_options)); + }else { +qdict_put_null (target,"backing" ); + } + } +} +static QemuOptsList vmdk_create_opts = { .name ="vmdk-create-opts" , .head =QTAILQ_HEAD_INITIALIZER (vmdk_create_opts.head),
@@ -2447,6 +2465,7 @@ static BlockDriver bdrv_vmdk = { .bdrv_get_specific_info = vmdk_get_specific_info, .bdrv_refresh_limits = vmdk_refresh_limits, .bdrv_get_info = vmdk_get_info, + .bdrv_gather_child_options = vmdk_gather_child_options, .supports_backing = true, .create_opts = &vmdk_create_opts,
Signature · 1 line
2.19.2
PATCH v12 23/31 block: Generically refresh runtime options
In reply to Max ReitzInstead of having every block driver which implements bdrv_refresh_filename() copy all of the strong runtime options over to bs->full_open_options, implement this process generically in bdrv_refresh_filename().
This patch only adds this new generic implementation, it does not remove the old functionality. This is done in a follow-up patch.
With this patch, some superfluous information (that should never have been there) may be removed from some JSON filenames, as can be seen in the change to iotest 110's reference output.
--- block.c | 116 ++++++++++++++++++++++++++++++++++++- tests/qemu-iotests/110.out | 2 +- 2 files changed, 116 insertions(+), 2 deletions(-)
block.c +115 -1
@@ -5317,6 +5317,92 @@ out:return to_replace_bs; } +/** +* Iterates through the list of runtime option keys that are said to +* be "strong" for a BDS. An option is called "strong" if it changes +* a BDS's data. For example, the null block driver's "size" and +* "read-zeroes" options are strong, but its "latency-ns" option is +* not. +* +* If a key returned by this function ends with a dot, all options +* starting with that prefix are strong. +*/ +static const char *const *strong_options (BlockDriverState *bs, +const char *const *curopt) +{ +static const char *const global_options[] = { +"driver" ,"filename" ,NULL + }; + +if (!curopt) { +return &global_options[0 ]; + } + + curopt++; +if (curopt == &global_options[ARRAY_SIZE (global_options) -1 ] && bs->drv) { + curopt = bs->drv->strong_runtime_opts; + } + +return (curopt && *curopt) ? curopt :NULL ; +} + +/** +* Copies all strong runtime options from bs->options to the given +* QDict. The set of strong option keys is determined by invoking +* strong_options(). +* +* Returns true iff any strong option was present in bs->options (and +* thus copied to the target QDict) with the exception of "filename" +* and "driver". The caller is expected to use this value to decide +* whether the existence of strong options prevents the generation of +* a plain filename. +*/ +static bool append_strong_runtime_options (QDict *d,BlockDriverState *bs) +{ +bool found_any = false; +const char *const *option_name =NULL ; + +if (!bs->drv) { +return false; + } + +while ((option_name =strong_options (bs, option_name))) { +bool option_given = false; + +assert (strlen (*option_name) >0 ); +if ((*option_name)[strlen (*option_name) -1 ] !='.' ) { +QObject *entry =qdict_get (bs->options, *option_name); +if (!entry) { +continue ; + } + +qdict_put_obj (d, *option_name,qobject_ref (entry)); + option_given = true; + }else { +const QDictEntry *entry; +for (entry =qdict_first (bs->options); entry; + entry =qdict_next (bs->options, entry)) + { +if (strstart (qdict_entry_key (entry), *option_name,NULL )) { +qdict_put_obj (d,qdict_entry_key (entry), +qobject_ref (qdict_entry_value (entry))); + option_given = true; + } + } + } + +/* While "driver" and "filename" need to be included in a JSON filename, +* their existence does not prohibit generation of a plain filename. */ +if (!found_any && option_given && +strcmp (*option_name,"driver" ) &&strcmp (*option_name,"filename" )) + { + found_any = true; + } + } + +return found_any; +} +static bool append_open_options (QDict *d,BlockDriverState *bs) {const QDictEntry *entry;
@@ -5493,9 +5579,37 @@ void bdrv_refresh_filename(BlockDriverState *bs) bs->full_open_options = opts; } +/* Gather the options QDict */ + opts =qdict_new (); +append_strong_runtime_options (opts, bs); + +if (drv->bdrv_gather_child_options) { +/* Some block drivers may not want to present all of their children's +* options, or name them differently from BdrvChild.name */ + drv->bdrv_gather_child_options (bs, opts, backing_overridden); + }else { + QLIST_FOREACH(child, &bs->children, next) { +if (child->role == &child_backing && !backing_overridden) { +/* We can skip the backing BDS if it has not been overridden */ +continue ; + } + +qdict_put (opts, child->name, +qobject_ref (child->bs->full_open_options)); + } + +if (backing_overridden && !bs->backing) { +/* Force no backing file */ +qdict_put_null (opts,"backing" ); + } + } + +qobject_unref (bs->full_open_options); + bs->full_open_options = opts; +if (bs->exact_filename[0 ]) {pstrcpy (bs->filename,sizeof (bs->filename), bs->exact_filename); - }else if (bs->full_open_options) { + }else {QString *json =qobject_to_json (QOBJECT (bs->full_open_options));snprintf (bs->filename,sizeof (bs->filename),"json:%s" ,qstring_get_str (json));
tests/qemu-iotests/110.out +1 -1
@@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b === Nodes without a common directory === -image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "blkverify": false, "rewrite-corrupted": false, "vote-threshold": 1}} +image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}} file format: IMGFMT virtual size: 64M (67108864 bytes) backing file: t.IMGFMT.base (cannot determine actual path)
Signature · 1 line
2.19.2
PATCH v12 24/31 block: Purify .bdrv_refresh_filename()
In reply to Max ReitzCurrently, BlockDriver.bdrv_refresh_filename() is supposed to both refresh the filename (BDS.exact_filename) and set BDS.full_open_options. Now that we have generic code in the central bdrv_refresh_filename() for creating BDS.full_open_options, we can drop the latter part from all BlockDriver.bdrv_refresh_filename() implementations.
This also means that we can drop all of the existing default code for this from the global bdrv_refresh_filename() itself.
Furthermore, we now have to call BlockDriver.bdrv_refresh_filename() after having set BDS.full_open_options, because the block driver's implementation should now be allowed to depend on BDS.full_open_options being set correctly.
Finally, with this patch we can drop the @options parameter from BlockDriver.bdrv_refresh_filename(); also, add a comment on this function's purpose in block/block_int.h while touching its interface.
This completely obsoletes blklogwrite's implementation of .bdrv_refresh_filename().
--- include/block/block_int.h | 6 +- block.c | 131 +++++++------------------------------- block/blkdebug.c | 54 ++++++---------- block/blklogwrites.c | 23 ------- block/blkverify.c | 16 +---- block/commit.c | 2 +- block/mirror.c | 2 +- block/nbd.c | 23 +------ block/nfs.c | 36 +---------- block/null.c | 22 ++++--- block/nvme.c | 22 ++++--- block/quorum.c | 30 --------- 12 files changed, 80 insertions(+), 287 deletions(-)
include/block/block_int.h +5 -1
@@ -139,7 +139,11 @@ struct BlockDriver { Error **errp);int (*bdrv_make_empty)(BlockDriverState *bs); -void (*bdrv_refresh_filename)(BlockDriverState *bs,QDict *options); +/* +* Refreshes the bs->exact_filename field. If that is impossible, +* bs->exact_filename has to be left empty. +*/ +void (*bdrv_refresh_filename)(BlockDriverState *bs);/* * Gathers the open options for all children into @target.
block.c +22 -109
157 lines not on this page · raw message
block/blkdebug.c +20 -34
71 lines not on this page · raw message
block/blklogwrites.c +0 -23
@@ -280,28 +280,6 @@ static int64_t blk_log_writes_getlength(BlockDriverState *bs)return bdrv_getlength (bs->file->bs); } -static void blk_log_writes_refresh_filename (BlockDriverState *bs, -QDict *options) -{ -BDRVBlkLogWritesState *s = bs->opaque; - -if (bs->file->bs->full_open_options - && s->log_file->bs->full_open_options) - { -QDict *opts =qdict_new (); -qdict_put_str (opts,"driver" ,"blklogwrites" ); - -qobject_ref (bs->file->bs->full_open_options); -qdict_put_obj (opts,"file" ,QOBJECT (bs->file->bs->full_open_options)); -qobject_ref (s->log_file->bs->full_open_options); -qdict_put_obj (opts,"log" , -QOBJECT (s->log_file->bs->full_open_options)); -qdict_put_int (opts,"log-sector-size" , s->sectorsize); - - bs->full_open_options = opts; - } -} - static void blk_log_writes_child_perm(BlockDriverState *bs, BdrvChild *c, const BdrvChildRole *role, BlockReopenQueue *ro_q,
@@ -532,7 +510,6 @@ static BlockDriver bdrv_blk_log_writes = { .bdrv_open = blk_log_writes_open, .bdrv_close = blk_log_writes_close, .bdrv_getlength = blk_log_writes_getlength, - .bdrv_refresh_filename = blk_log_writes_refresh_filename, .bdrv_child_perm = blk_log_writes_child_perm, .bdrv_refresh_limits = blk_log_writes_refresh_limits,
block/blkverify.c +1 -15
@@ -281,24 +281,10 @@ static bool blkverify_recurse_is_first_non_filter(BlockDriverState *bs,return bdrv_recurse_is_first_non_filter (s->test_file->bs, candidate); } -static void blkverify_refresh_filename (BlockDriverState *bs,QDict *options) +static void blkverify_refresh_filename (BlockDriverState *bs) {BDRVBlkverifyState *s = bs->opaque; -if (bs->file->bs->full_open_options - && s->test_file->bs->full_open_options) - { -QDict *opts =qdict_new (); -qdict_put_str (opts,"driver" ,"blkverify" ); - -qdict_put (opts,"raw" , -qobject_ref (bs->file->bs->full_open_options)); -qdict_put (opts,"test" , -qobject_ref (s->test_file->bs->full_open_options)); - - bs->full_open_options = opts; - } -if (bs->file->bs->exact_filename[0 ] && s->test_file->bs->exact_filename[0 ]) {
block/commit.c +1 -1
@@ -230,7 +230,7 @@ static int coroutine_fn bdrv_commit_top_preadv(BlockDriverState *bs,return bdrv_co_preadv (bs->backing, offset, bytes, qiov, flags); } -static void bdrv_commit_top_refresh_filename (BlockDriverState *bs,QDict *opts) +static void bdrv_commit_top_refresh_filename (BlockDriverState *bs) {pstrcpy (bs->exact_filename,sizeof (bs->exact_filename), bs->backing->bs->filename);
block/mirror.c +1 -1
@@ -1432,7 +1432,7 @@ static int coroutine_fn bdrv_mirror_top_pdiscard(BlockDriverState *bs, NULL, 0); } -static void bdrv_mirror_top_refresh_filename (BlockDriverState *bs,QDict *opts) +static void bdrv_mirror_top_refresh_filename (BlockDriverState *bs) {if (bs->backing ==NULL ) {/* we can be here after failed bdrv_attach_child in
block/nbd.c +1 -22
@@ -513,12 +513,9 @@ static void nbd_attach_aio_context(BlockDriverState *bs,nbd_client_attach_aio_context (bs, new_context); } -static void nbd_refresh_filename (BlockDriverState *bs,QDict *options) +static void nbd_refresh_filename (BlockDriverState *bs) {BDRVNBDState *s = bs->opaque; -QDict *opts =qdict_new (); -QObject *saddr_qdict; -Visitor *ov;const char *host =NULL , *port =NULL , *path =NULL ;if (s->saddr->type ==SOCKET_ADDRESS_TYPE_INET ) {
@@ -531,8 +528,6 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) path = s->saddr->u.q_unix.path; }/* else can't represent as pseudo-filename */ -qdict_put_str (opts,"driver" ,"nbd" ); -if (path && s->export) {snprintf (bs->exact_filename,sizeof (bs->exact_filename),"nbd+unix:///%s?socket=%s" , s->export, path);
@@ -546,22 +541,6 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options)snprintf (bs->exact_filename,sizeof (bs->exact_filename),"nbd://%s:%s" , host, port); } - - ov =qobject_output_visitor_new (&saddr_qdict); -visit_type_SocketAddress (ov,NULL , &s->saddr, &error_abort); -visit_complete (ov, &saddr_qdict); -visit_free (ov); -qdict_put_obj (opts,"server" , saddr_qdict); - -if (s->export) { -qdict_put_str (opts,"export" , s->export); - } -if (s->tlscredsid) { -qdict_put_str (opts,"tls-creds" , s->tlscredsid); - } - -qdict_flatten (opts); - bs->full_open_options = opts; }static char *nbd_dirname (BlockDriverState *bs,Error **errp)
block/nfs.c +1 -35
@@ -799,14 +799,9 @@ static int nfs_reopen_prepare(BDRVReopenState *state,return 0 ; } -static void nfs_refresh_filename (BlockDriverState *bs,QDict *options) +static void nfs_refresh_filename (BlockDriverState *bs) {NFSClient *client = bs->opaque; -QDict *opts =qdict_new (); -QObject *server_qdict; -Visitor *ov; - -qdict_put_str (opts,"driver" ,"nfs" );if (client->uid && !client->gid) { snprintf(bs->exact_filename, sizeof(bs->exact_filename),
@@ -824,35 +819,6 @@ static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)snprintf (bs->exact_filename,sizeof (bs->exact_filename),"nfs://%s%s" , client->server->host, client->path); } - - ov =qobject_output_visitor_new (&server_qdict); -visit_type_NFSServer (ov,NULL , &client->server, &error_abort); -visit_complete (ov, &server_qdict); -qdict_put_obj (opts,"server" , server_qdict); -qdict_put_str (opts,"path" , client->path); - -if (client->uid) { -qdict_put_int (opts,"user" , client->uid); - } -if (client->gid) { -qdict_put_int (opts,"group" , client->gid); - } -if (client->tcp_syncnt) { -qdict_put_int (opts,"tcp-syn-cnt" , client->tcp_syncnt); - } -if (client->readahead) { -qdict_put_int (opts,"readahead-size" , client->readahead); - } -if (client->pagecache) { -qdict_put_int (opts,"page-cache-size" , client->pagecache); - } -if (client->debug) { -qdict_put_int (opts,"debug" , client->debug); - } - -visit_free (ov); -qdict_flatten (opts); - bs->full_open_options = opts; }static char *nfs_dirname (BlockDriverState *bs,Error **errp)
block/null.c +14 -8
@@ -239,17 +239,23 @@ static int coroutine_fn null_co_block_status(BlockDriverState *bs,return ret; } -static void null_refresh_filename (BlockDriverState *bs,QDict *opts) +static void null_refresh_filename (BlockDriverState *bs) { -qdict_del (opts,"filename" ); - -if (!qdict_size (opts)) { -snprintf (bs->exact_filename,sizeof (bs->exact_filename),"%s://" , - bs->drv->format_name); +const QDictEntry *e; + +for (e =qdict_first (bs->full_open_options); e; + e =qdict_next (bs->full_open_options, e)) + { +/* These options can be ignored */ +if (strcmp (qdict_entry_key (e),"filename" ) && +strcmp (qdict_entry_key (e),"driver" )) + { +return ; + } } -qdict_put_str (opts,"driver" , bs->drv->format_name); - bs->full_open_options =qobject_ref (opts); +snprintf (bs->exact_filename,sizeof (bs->exact_filename),"%s://" , + bs->drv->format_name); }static const char *const null_strong_runtime_opts[] = {
block/nvme.c +14 -8
@@ -1056,17 +1056,23 @@ static int nvme_reopen_prepare(BDRVReopenState *reopen_state,return 0 ; } -static void nvme_refresh_filename (BlockDriverState *bs,QDict *opts) +static void nvme_refresh_filename (BlockDriverState *bs) { -qdict_del (opts,"filename" ); - -if (!qdict_size (opts)) { -snprintf (bs->exact_filename,sizeof (bs->exact_filename),"%s://" , - bs->drv->format_name); +const QDictEntry *e; + +for (e =qdict_first (bs->full_open_options); e; + e =qdict_next (bs->full_open_options, e)) + { +/* These options can be ignored */ +if (strcmp (qdict_entry_key (e),"filename" ) && +strcmp (qdict_entry_key (e),"driver" )) + { +return ; + } } -qdict_put_str (opts,"driver" , bs->drv->format_name); - bs->full_open_options =qobject_ref (opts); +snprintf (bs->exact_filename,sizeof (bs->exact_filename),"%s://" , + bs->drv->format_name); }static void nvme_refresh_limits (BlockDriverState *bs,Error **errp)
block/quorum.c +0 -30
@@ -1065,35 +1065,6 @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child,bdrv_drained_end (bs); } -static void quorum_refresh_filename (BlockDriverState *bs,QDict *options) -{ -BDRVQuorumState *s = bs->opaque; -QDict *opts; -QList *children; -int i; - -for (i =0 ; i < s->num_children; i++) { -if (!s->children[i]->bs->full_open_options) { -return ; - } - } - - children =qlist_new (); -for (i =0 ; i < s->num_children; i++) { -qlist_append (children, -qobject_ref (s->children[i]->bs->full_open_options)); - } - - opts =qdict_new (); -qdict_put_str (opts,"driver" ,"quorum" ); -qdict_put_int (opts,QUORUM_OPT_VOTE_THRESHOLD , s->threshold); -qdict_put_bool (opts,QUORUM_OPT_BLKVERIFY , s->is_blkverify); -qdict_put_bool (opts,QUORUM_OPT_REWRITE , s->rewrite_corrupted); -qdict_put (opts,"children" , children); - - bs->full_open_options = opts; -} -static void quorum_gather_child_options (BlockDriverState *bs,QDict *target,bool backing_overridden) {
@@ -1159,7 +1130,6 @@ static BlockDriver bdrv_quorum = { .bdrv_open = quorum_open, .bdrv_close = quorum_close, - .bdrv_refresh_filename = quorum_refresh_filename, .bdrv_gather_child_options = quorum_gather_child_options, .bdrv_dirname = quorum_dirname,
Signature · 1 line
2.19.2
PATCH v12 25/31 block: Do not copy exact_filename from format file
In reply to Max ReitzIf a format BDS's file BDS is in turn a format BDS, we cannot simply use the same filename, because when opening a BDS tree based on a filename alone, qemu will create only one format node on top of one protocol node (disregarding a potential backing file).
--- block.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
block.c +15 -3
@@ -5513,9 +5513,21 @@ void bdrv_refresh_filename(BlockDriverState *bs) bs->exact_filename[0 ] ='\0' ; -/* If no specific options have been given for this BDS, the filename of -* the underlying file should suffice for this one as well */ -if (bs->file->bs->exact_filename[0 ] && !generate_json_filename) { +/* +* We can use the underlying file's filename if: +* - it has a filename, +* - the file is a protocol BDS, and +* - opening that file (as this BDS's format) will automatically create +* the BDS tree we have right now, that is: +* - the user did not significantly change this BDS's behavior with +* some explicit (strong) options +* - no non-file child of this BDS has been overridden by the user +* Both of these conditions are represented by generate_json_filename. +*/ +if (bs->file->bs->exact_filename[0 ] && + bs->file->bs->drv->bdrv_file_open && + !generate_json_filename) + {strcpy (bs->exact_filename, bs->file->bs->exact_filename); } }
Signature · 1 line
2.19.2
PATCH v12 26/31 block/nvme: Fix bdrv_refresh_filename()
In reply to Max ReitzCurrently, nvme's bdrv_refresh_filename() is an exact copy of null's implementation. However, for null, "null-co://" and "null-aio://" are indeed valid filenames -- for nvme, they are not, as a device address is still required.
The correct implementation should generate a filename of the form "nvme://[PCI address]/[namespace]" (as the comment above nvme_parse_filename() describes).
--- block/nvme.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
block/nvme.c +9 -14
@@ -111,6 +111,9 @@ typedef struct {/* Total size of mapped qiov, accessed under dma_map_lock */ int dma_map_count; + +/* PCI address (required for nvme_refresh_filename()) */ +char *device; } BDRVNVMeState;#define NVME_BLOCK_OPT_DEVICE "device"
@@ -556,6 +559,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace,qemu_co_mutex_init (&s->dma_map_lock);qemu_co_queue_init (&s->dma_flush_queue); + s->device =g_strdup (device); s->nsid = namespace; s->aio_context =bdrv_get_aio_context (bs); ret =event_notifier_init (&s->irq_notifier,0 );
@@ -728,6 +732,8 @@ static void nvme_close(BlockDriverState *bs)event_notifier_cleanup (&s->irq_notifier);qemu_vfio_pci_unmap_bar (s->vfio,0 , (void *)s->regs,0 ,NVME_BAR_SIZE );qemu_vfio_close (s->vfio); + +g_free (s->device); } static int nvme_file_open(BlockDriverState *bs, QDict *options, int flags,
@@ -1058,21 +1064,10 @@ static int nvme_reopen_prepare(BDRVReopenState *reopen_state,static void nvme_refresh_filename (BlockDriverState *bs) { -const QDictEntry *e; - -for (e =qdict_first (bs->full_open_options); e; - e =qdict_next (bs->full_open_options, e)) - { -/* These options can be ignored */ -if (strcmp (qdict_entry_key (e),"filename" ) && -strcmp (qdict_entry_key (e),"driver" )) - { -return ; - } - } +BDRVNVMeState *s = bs->opaque; -snprintf (bs->exact_filename,sizeof (bs->exact_filename),"%s://" , - bs->drv->format_name); +snprintf (bs->exact_filename,sizeof (bs->exact_filename),"nvme://%s/%i" , + s->device, s->nsid); }static void nvme_refresh_limits (BlockDriverState *bs,Error **errp)
Signature · 1 line
2.19.2
PATCH v12 27/31 block/curl: Harmonize option defaults
In reply to Max ReitzBoth of the defaults we currently have in the curl driver are named based on a slightly different schema, let's unify that and call both CURL_BLOCK_OPT_${NAME}_DEFAULT.
While at it, we can add a macro for the third option for which a default exists, namely "sslverify".
--- block/curl.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
block/curl.c +8 -5
@@ -73,8 +73,6 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,#define CURL_NUM_STATES 8#define CURL_NUM_ACB 8 -#define READ_AHEAD_DEFAULT (256 * 1024) -#define CURL_TIMEOUT_DEFAULT 5#define CURL_TIMEOUT_MAX 10000#define CURL_BLOCK_OPT_URL "url"
@@ -88,6 +86,10 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,#define CURL_BLOCK_OPT_PROXY_USERNAME "proxy-username"#define CURL_BLOCK_OPT_PROXY_PASSWORD_SECRET "proxy-password-secret" +#define CURL_BLOCK_OPT_READAHEAD_DEFAULT (256 * 1024) +#define CURL_BLOCK_OPT_SSLVERIFY_DEFAULT true +#define CURL_BLOCK_OPT_TIMEOUT_DEFAULT 5 +struct BDRVCURLState ;static bool libcurl_initialized;
@@ -708,7 +710,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, } s->readahead_size =qemu_opt_get_size (opts,CURL_BLOCK_OPT_READAHEAD , -READ_AHEAD_DEFAULT ); +CURL_BLOCK_OPT_READAHEAD_DEFAULT );if ((s->readahead_size &0x1ff ) !=0 ) {error_setg (errp,"HTTP_READAHEAD_SIZE %zd is not a multiple of 512" , s->readahead_size);
@@ -716,13 +718,14 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, } s->timeout =qemu_opt_get_number (opts,CURL_BLOCK_OPT_TIMEOUT , -CURL_TIMEOUT_DEFAULT ); +CURL_BLOCK_OPT_TIMEOUT_DEFAULT );if (s->timeout >CURL_TIMEOUT_MAX ) {error_setg (errp,"timeout parameter is too large or negative" ); goto out_noclean; } - s->sslverify =qemu_opt_get_bool (opts,CURL_BLOCK_OPT_SSLVERIFY , true); + s->sslverify =qemu_opt_get_bool (opts,CURL_BLOCK_OPT_SSLVERIFY , +CURL_BLOCK_OPT_SSLVERIFY_DEFAULT ); cookie =qemu_opt_get (opts,CURL_BLOCK_OPT_COOKIE ); cookie_secret =qemu_opt_get (opts,CURL_BLOCK_OPT_COOKIE_SECRET );
Signature · 1 line
2.19.2
PATCH v12 28/31 block/curl: Implement bdrv_refresh_filename()
In reply to Max Reitz--- block/curl.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
block/curl.c +21 -0
@@ -963,6 +963,23 @@ static int64_t curl_getlength(BlockDriverState *bs)return s->len; } +static void curl_refresh_filename (BlockDriverState *bs) +{ +BDRVCURLState *s = bs->opaque; + +/* "readahead" and "timeout" do not change the guest-visible data, +* so ignore them */ +if (s->sslverify !=CURL_BLOCK_OPT_SSLVERIFY_DEFAULT || + s->cookie || s->username || s->password || s->proxyusername || + s->proxypassword) + { +return ; + } + +pstrcpy (bs->exact_filename,sizeof (bs->exact_filename), s->url); +} + +static const char *const curl_strong_runtime_opts[] = {CURL_BLOCK_OPT_URL ,CURL_BLOCK_OPT_SSLVERIFY ,
@@ -991,6 +1008,7 @@ static BlockDriver bdrv_http = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + .bdrv_refresh_filename = curl_refresh_filename, .strong_runtime_opts = curl_strong_runtime_opts, };
@@ -1009,6 +1027,7 @@ static BlockDriver bdrv_https = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + .bdrv_refresh_filename = curl_refresh_filename, .strong_runtime_opts = curl_strong_runtime_opts, };
@@ -1027,6 +1046,7 @@ static BlockDriver bdrv_ftp = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + .bdrv_refresh_filename = curl_refresh_filename, .strong_runtime_opts = curl_strong_runtime_opts, };
@@ -1045,6 +1065,7 @@ static BlockDriver bdrv_ftps = { .bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context, + .bdrv_refresh_filename = curl_refresh_filename, .strong_runtime_opts = curl_strong_runtime_opts, };
Signature · 1 line
2.19.2
PATCH v12 29/31 block/null: Generate filename even with latency-ns
In reply to Max ReitzWhile we cannot represent the latency-ns option in a filename, it is not a strong option so not being able to should not stop us from generating a filename nonetheless.
--- block/null.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/null.c +2 -1
@@ -248,7 +248,8 @@ static void null_refresh_filename(BlockDriverState *bs) {/* These options can be ignored */ if (strcmp (qdict_entry_key (e),"filename" ) && -strcmp (qdict_entry_key (e),"driver" )) +strcmp (qdict_entry_key (e),"driver" ) && +strcmp (qdict_entry_key (e),NULL_OPT_LATENCY )) {return ; }
Signature · 1 line
2.19.2
PATCH v12 30/31 block: BDS options may lack the "driver" option
In reply to Max ReitzWhen BDSs are created by qemu itself (e.g. as filters in block jobs), they may not have a "driver" option in their options QDict. When generating a json:{} filename, however, it must always be present.
--- block.c | 6 ++++++ 1 file changed, 6 insertions(+)
block.c +6 -0
@@ -5400,6 +5400,12 @@ static bool append_strong_runtime_options(QDict *d, BlockDriverState *bs) } } +if (!qdict_haskey (d,"driver" )) { +/* Drivers created with bdrv_new_open_driver() may not have a +* @driver option. Add it here. */ +qdict_put_str (d,"driver" , bs->drv->format_name); + } +return found_any; }
Signature · 1 line
2.19.2
PATCH v12 31/31 iotests: Test json:{} filenames of internal BDSs
In reply to Max Reitz--- tests/qemu-iotests/224 | 139 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/224.out | 18 +++++ tests/qemu-iotests/group | 1 + 3 files changed, 158 insertions(+) create mode 100755 tests/qemu-iotests/224 create mode 100644 tests/qemu-iotests/224.out
tests/qemu-iotests/224 new file +139 -0
@@ -0,0 +1,139 @@ +#!/usr/bin/env python +# +# Test json:{} filenames with qemu-internal BDSs +# (the one of commit, to be precise) +# +# Copyright (C) 2018 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Creator/Owner: Max Reitz <[email protected]> + +import iotests +from iotests import log, qemu_img, qemu_io_silent, filter_testfiles, \ + filter_imgfmt +import json + +# Need backing file support (for arbitrary backing formats) +iotests.verify_image_format(supported_fmts=['qcow2', 'qcow', 'qed']) +iotests.verify_platform(['linux']) + + +# There are two variations of this test: +# (1) We do not set filter_node_name. In that case, the commit_top +# driver should not appear anywhere. +# (2) We do set filter_node_name. In that case, it should appear. +# +# This for loop executes both. +for filter_node_name in False, True: + log('') + log('--- filter_node_name: %s ---' % filter_node_name) + log('') + + with iotests.FilePath('base.img') as base_img_path, \ + iotests.FilePath('mid.img') as mid_img_path, \ + iotests.FilePath('top.img') as top_img_path, \ + iotests.VM() as vm: + + assert qemu_img('create', '-f', iotests.imgfmt, + base_img_path, '64M') == 0 + assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, + mid_img_path) == 0 + assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path, + top_img_path) == 0 + + # Something to commit + assert qemu_io_silent(mid_img_path, '-c', 'write -P 1 0 1M') == 0 + + vm.launch() + + # Change the bottom-most image's backing file (to null-co://) + # to enforce json:{} filenames + vm.qmp_log('blockdev-add', + node_name='top', + driver=iotests.imgfmt, + file={ + 'driver': 'file', + 'filename': top_img_path + }, + backing={ + 'node-name': 'mid', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': mid_img_path + }, + 'backing': { + 'node-name': 'base', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': base_img_path + }, + 'backing': { + 'driver': 'null-co' + } + } + }, + filters=[filter_testfiles, filter_imgfmt]) + + # As long as block-commit does not accept node names, we have to + # get our mid/base filenames here + mid_name = vm.node_info('mid')['image']['filename'] + base_name = vm.node_info('base')['image']['filename'] + + assert mid_name[:5] == 'json:' + assert base_name[:5] == 'json:' + + # Start the block job + if filter_node_name: + vm.qmp_log('block-commit', + job_id='commit', + device='top', + filter_node_name='filter_node', + top=mid_name, + base=base_name, + speed=1, + filters=[filter_testfiles, filter_imgfmt]) + else: + vm.qmp_log('block-commit', + job_id='commit', + device='top', + top=mid_name, + base=base_name, + speed=1, + filters=[filter_testfiles, filter_imgfmt]) + + vm.qmp_log('job-pause', id='commit') + + # Get and parse top's json:{} filename + top_name = vm.node_info('top')['image']['filename'] + + vm.shutdown() + + assert top_name[:5] == 'json:' + top_options = json.loads(top_name[5:]) + + if filter_node_name: + # This should be present and set + assert top_options['backing']['driver'] == 'commit_top' + # And the mid image is commit_top's backing image + mid_options = top_options['backing']['backing'] + else: + # The mid image should appear as the immediate backing BDS + # of top + mid_options = top_options['backing'] + + assert mid_options['driver'] == iotests.imgfmt + assert mid_options['file']['filename'] == mid_img_path
tests/qemu-iotests/224.out new file +18 -0
@@ -0,0 +1,18 @@ + +--- filter_node_name: False --- + +{"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-base.img"}, "node-name": "base"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-mid.img"}, "node-name": "mid"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-top.img"}, "node_name": "top"}} +{"return": {}} +{"execute": "block-commit", "arguments": {"base": "json:{\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}", "device": "top", "job_id": "commit", "speed": 1, "top": "json:{\"backing\": {\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-mid.img\"}}"}} +{"return": {}} +{"execute": "job-pause", "arguments": {"id": "commit"}} +{"return": {}} + +--- filter_node_name: True --- + +{"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-base.img"}, "node-name": "base"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-mid.img"}, "node-name": "mid"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-top.img"}, "node_name": "top"}} +{"return": {}} +{"execute": "block-commit", "arguments": {"base": "json:{\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}", "device": "top", "filter_node_name": "filter_node", "job_id": "commit", "speed": 1, "top": "json:{\"backing\": {\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-mid.img\"}}"}} +{"return": {}} +{"execute": "job-pause", "arguments": {"id": "commit"}} +{"return": {}}
tests/qemu-iotests/group +1 -0
@@ -224,6 +224,7 @@ 221 rw auto quick 222 rw auto quick 223 rw auto quick +224 rw auto quick 225 rw auto quick 226 auto quick 227 auto quick
Signature · 1 line
2.19.2
Quoted 9 lines · Max Reitz
Once more, I’ll spare both me and you another iteration of the cover letter, so I direct you to the previous version’s cover letter (which will direct you further):
http://lists.nongnu.org/archive/html/qemu-block/2018-10/msg00229.html
There are only minor changes in this version. Provided no major complaints arise, I intend to merge this series in the next month.
It looked like this got a full set of reviews by Berto, should we not just merge it and see who cries?
Would you like additional eyes on it?
Quoted 9 lines · John Snow
Quoted 6 lines · Max Reitz
Once more, I’ll spare both me and you another iteration of the cover letter, so I direct you to the previous version’s cover letter (which will direct you further):
http://lists.nongnu.org/archive/html/qemu-block/2018-10/msg00229.html
Quoted 8 lines
Quoted 3 lines
There are only minor changes in this version. Provided no major complaints arise, I intend to merge this series in the next month.
It looked like this got a full set of reviews by Berto, should we not just merge it and see who cries?
Would you like additional eyes on it?
I was about to rebase it (and send it again with a shorter "I will merge this" period), but then I found that a non-non-significant number of iotests failed, so I wanted to fix those first.
Max