[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 6/6] qcow2: Allow -o compat=v3 during qemu-img amend
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 6/6] qcow2: Allow -o compat=v3 during qemu-img amend |
Date: |
Mon, 8 Jul 2019 16:18:12 +0200 |
From: Eric Blake <address@hidden>
Commit b76b4f60 allowed '-o compat=v3' as an alias for the
less-appealing '-o compat=1.1' for 'qemu-img create' since we want to
use the QMP form as much as possible, but forgot to do likewise for
qemu-img amend. Also, it doesn't help that '-o help' doesn't list our
new preferred spellings.
Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 2a59eb27fe..039bdc2f7e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -4823,9 +4823,9 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
compat = qemu_opt_get(opts, BLOCK_OPT_COMPAT_LEVEL);
if (!compat) {
/* preserve default */
- } else if (!strcmp(compat, "0.10")) {
+ } else if (!strcmp(compat, "0.10") || !strcmp(compat, "v2")) {
new_version = 2;
- } else if (!strcmp(compat, "1.1")) {
+ } else if (!strcmp(compat, "1.1") || !strcmp(compat, "v3")) {
new_version = 3;
} else {
error_setg(errp, "Unknown compatibility level %s", compat);
@@ -5098,7 +5098,7 @@ static QemuOptsList qcow2_create_opts = {
{
.name = BLOCK_OPT_COMPAT_LEVEL,
.type = QEMU_OPT_STRING,
- .help = "Compatibility level (0.10 or 1.1)"
+ .help = "Compatibility level (v2 [0.10] or v3 [1.1])"
},
{
.name = BLOCK_OPT_BACKING_FILE,
--
2.20.1
- [Qemu-block] [PULL 0/6] Block layer patches, Kevin Wolf, 2019/07/08
- [Qemu-block] [PULL 5/6] MAINTAINERS: update RBD block maintainer, Kevin Wolf, 2019/07/08
- [Qemu-block] [PULL 1/6] vl: add qemu_add_vm_change_state_handler_prio(), Kevin Wolf, 2019/07/08
- [Qemu-block] [PULL 3/6] virtio-scsi: restart DMA after iothread, Kevin Wolf, 2019/07/08
- [Qemu-block] [PULL 2/6] qdev: add qdev_add_vm_change_state_handler(), Kevin Wolf, 2019/07/08
- [Qemu-block] [PULL 4/6] block/qcow: Improve error when opening qcow2 files as qcow, Kevin Wolf, 2019/07/08
- [Qemu-block] [PULL 6/6] qcow2: Allow -o compat=v3 during qemu-img amend,
Kevin Wolf <=
- Re: [Qemu-block] [PULL 0/6] Block layer patches, Peter Maydell, 2019/07/08