[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 06/12] qemu-img: Check create_opts before image ame
From: |
Max Reitz |
Subject: |
[Qemu-stable] [PATCH 06/12] qemu-img: Check create_opts before image amendment |
Date: |
Tue, 25 Nov 2014 15:07:59 +0100 |
The image options which can be amended are described by the .create_opts
field for every driver. This field must therefore be non-NULL so that
anything can be amended in the first place. Check that this holds true
before going into qemu_opts_create() (because if .create_opts is NULL,
the create_opts pointer in img_amend() will be NULL after
qemu_opts_append()).
Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
qemu-img.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/qemu-img.c b/qemu-img.c
index 8c4edf3..7876258 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2986,6 +2986,13 @@ static int img_amend(int argc, char **argv)
goto out;
}
+ if (!bs->drv->create_opts) {
+ error_report("Format driver '%s' does not support any options to
amend",
+ fmt);
+ ret = -1;
+ goto out;
+ }
+
create_opts = qemu_opts_append(create_opts, bs->drv->create_opts);
opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
if (options && qemu_opts_do_parse(opts, options, NULL)) {
--
1.9.3
- Re: [Qemu-stable] [Qemu-devel] [PATCH 01/12] block: qcow2 driver may not be found, (continued)
[Qemu-stable] [PATCH 03/12] block/nfs: Add create_opts, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 04/12] block: Check create_opts before image creation, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 05/12] qemu-img: Check create_opts before image creation, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 06/12] qemu-img: Check create_opts before image amendment,
Max Reitz <=
[Qemu-stable] [PATCH 08/12] iotests: Add test for unsupported image creation, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 07/12] iotests: Only kill NBD server if it runs, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 09/12] qcow2: Prevent numerical overflow, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 10/12] qcow2: Flushing the caches in qcow2_close may fail, Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 12/12] block/raw-posix: Fix ret in raw_open_common(), Max Reitz, 2014/11/25
[Qemu-stable] [PATCH 11/12] qcow2: Respect bdrv_truncate() error, Max Reitz, 2014/11/25