[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 04/10] vmdk: Add trivial backing_fmt support
From: |
Eric Blake |
Subject: |
[PATCH v6 04/10] vmdk: Add trivial backing_fmt support |
Date: |
Mon, 6 Jul 2020 15:39:48 -0500 |
vmdk already requires that if backing_file is present, that it be
another vmdk image (see vmdk_co_do_create). Meanwhile, we want to
move towards always being explicit about the backing format for other
drivers where it matters. So for convenience, make qemu-img create -F
vmdk work, while rejecting all other explicit formats (note that this
is only for QemuOpts usage; there is no change to the QAPI to allow a
format through -blockdev).
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/vmdk.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/block/vmdk.c b/block/vmdk.c
index 62da4651263b..6c58e5ec2e43 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2638,6 +2638,14 @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver
*drv,
bool zeroed_grain;
bool compat6;
VMDKCreateOptsData data;
+ char *backing_fmt = NULL;
+
+ backing_fmt = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT);
+ if (backing_fmt && strcmp(backing_fmt, "vmdk") != 0) {
+ error_setg(errp, "backing_file must be a vmdk image");
+ ret = -EINVAL;
+ goto exit;
+ }
if (filename_decompose(filename, path, prefix, postfix, PATH_MAX, errp)) {
ret = -EINVAL;
@@ -2696,6 +2704,7 @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver
*drv,
vmdk_co_create_opts_cb, &data, errp);
exit:
+ g_free(backing_fmt);
g_free(adapter_type);
g_free(backing_file);
g_free(hw_version);
@@ -3031,6 +3040,11 @@ static QemuOptsList vmdk_create_opts = {
.type = QEMU_OPT_STRING,
.help = "File name of a base image"
},
+ {
+ .name = BLOCK_OPT_BACKING_FMT,
+ .type = QEMU_OPT_STRING,
+ .help = "Must be 'vmdk' if present",
+ },
{
.name = BLOCK_OPT_COMPAT6,
.type = QEMU_OPT_BOOL,
--
2.27.0
- [PATCH v6 00/10] Tighten qemu-img rules on missing backing format, Eric Blake, 2020/07/06
- [PATCH v6 02/10] block: Finish deprecation of 'qemu-img convert -n -o', Eric Blake, 2020/07/06
- [PATCH v6 01/10] qemu-img: Flush stdout before before potential stderr messages, Eric Blake, 2020/07/06
- [PATCH v6 04/10] vmdk: Add trivial backing_fmt support,
Eric Blake <=
- [PATCH v6 03/10] sheepdog: Add trivial backing_fmt support, Eric Blake, 2020/07/06
- [PATCH v6 05/10] qcow: Tolerate backing_fmt=, Eric Blake, 2020/07/06
- [PATCH v6 06/10] block: Error if backing file fails during creation without -u, Eric Blake, 2020/07/06
- [PATCH v6 07/10] qcow2: Deprecate use of qemu-img amend to change backing file, Eric Blake, 2020/07/06
- [PATCH v6 10/10] qemu-img: Deprecate use of -b without -F, Eric Blake, 2020/07/06
- [PATCH v6 08/10] iotests: Specify explicit backing format where sensible, Eric Blake, 2020/07/06
- [PATCH v6 09/10] block: Add support to warn on backing file change without format, Eric Blake, 2020/07/06
- Re: [PATCH v6 00/10] Tighten qemu-img rules on missing backing format, Kevin Wolf, 2020/07/07