diff options
| author | Eric Blake | 2020-07-06 22:39:53 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2020-07-14 15:18:59 +0200 |
| commit | e54ee1b385a9d084b4052b6db7391ea2fd799fa8 (patch) | |
| tree | d6e366c994426adc6f217faac79b22c3dde30507 /block | |
| parent | iotests: Specify explicit backing format where sensible (diff) | |
| download | qemu-e54ee1b385a9d084b4052b6db7391ea2fd799fa8.tar.gz qemu-e54ee1b385a9d084b4052b6db7391ea2fd799fa8.tar.xz qemu-e54ee1b385a9d084b4052b6db7391ea2fd799fa8.zip | |
block: Add support to warn on backing file change without format
For now, this is a mechanical addition; all callers pass false. But
the next patch will use it to improve 'qemu-img rebase -u' when
selecting a backing file with no format.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Message-Id: <20200706203954.341758-10-eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 2 | ||||
| -rw-r--r-- | block/stream.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index f3fc2707cd..fadf3422f8 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3627,7 +3627,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) } ret = bdrv_change_backing_file(blk_bs(blk), qcow2_opts->backing_file, - backing_format); + backing_format, false); if (ret < 0) { error_setg_errno(errp, -ret, "Could not assign backing file '%s' " "with format '%s'", qcow2_opts->backing_file, diff --git a/block/stream.c b/block/stream.c index aa2e7af98e..310ccbaa4c 100644 --- a/block/stream.c +++ b/block/stream.c @@ -78,7 +78,7 @@ static int stream_prepare(Job *job) } } bdrv_set_backing_hd(bs, base, &local_err); - ret = bdrv_change_backing_file(bs, base_id, base_fmt); + ret = bdrv_change_backing_file(bs, base_id, base_fmt, false); if (local_err) { error_report_err(local_err); return -EPERM; |