|
 |
1bdc94 |
From b7988ef42d1a3b892c8b3cc99ad7782f2dc3e05c Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Date: Mon, 25 Jun 2018 13:06:56 +0200
|
|
|
1bdc94 |
Subject: [PATCH 38/54] qemu-img: Use only string options in img_open_opts
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180618163106.23010-3-mreitz@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80774
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 2/3] qemu-img: Use only string options in img_open_opts
|
|
|
1bdc94 |
Bugzilla: 1576598
|
|
|
1bdc94 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
img_open_opts() takes a QemuOpts and converts them to a QDict, so all
|
|
|
1bdc94 |
values therein are strings. Then it may try to call qdict_get_bool(),
|
|
|
1bdc94 |
however, which will fail with a segmentation fault every time:
|
|
|
1bdc94 |
|
|
|
1bdc94 |
$ ./qemu-img info -U --image-opts \
|
|
|
1bdc94 |
driver=file,filename=/dev/null,force-share=off
|
|
|
1bdc94 |
[1] 27869 segmentation fault (core dumped) ./qemu-img info -U
|
|
|
1bdc94 |
--image-opts driver=file,filename=/dev/null,force-share=off
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Fix this by using qdict_get_str() and comparing the value as a string.
|
|
|
1bdc94 |
Also, when adding a force-share value to the QDict, add it as a string
|
|
|
1bdc94 |
so it fits the rest of the dict.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Cc: qemu-stable@nongnu.org
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Message-id: 20180502202051.15493-3-mreitz@redhat.com
|
|
|
1bdc94 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 4615f87832d2fcb7a544bedeece2741bf8c21f94)
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
qemu-img.c | 4 ++--
|
|
|
1bdc94 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/qemu-img.c b/qemu-img.c
|
|
|
1bdc94 |
index 62b29e7..60e45ec 100644
|
|
|
1bdc94 |
--- a/qemu-img.c
|
|
|
1bdc94 |
+++ b/qemu-img.c
|
|
|
1bdc94 |
@@ -277,12 +277,12 @@ static BlockBackend *img_open_opts(const char *optstr,
|
|
|
1bdc94 |
options = qemu_opts_to_qdict(opts, NULL);
|
|
|
1bdc94 |
if (force_share) {
|
|
|
1bdc94 |
if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE)
|
|
|
1bdc94 |
- && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) {
|
|
|
1bdc94 |
+ && strcmp(qdict_get_str(options, BDRV_OPT_FORCE_SHARE), "on")) {
|
|
|
1bdc94 |
error_report("--force-share/-U conflicts with image options");
|
|
|
1bdc94 |
qobject_unref(options);
|
|
|
1bdc94 |
return NULL;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
- qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
|
|
|
1bdc94 |
+ qdict_put_str(options, BDRV_OPT_FORCE_SHARE, "on");
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
blk = blk_new_open(NULL, NULL, options, flags, &local_err);
|
|
|
1bdc94 |
if (!blk) {
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|