diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-13 16:56:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-13 16:56:06 +0100 |
| commit | 49bcce4b9c11759678fd223aefb48691c4959d4f (patch) | |
| tree | a497d6ce8488623426d5ff5e9a0c8758a3caea33 /qemu-img.c | |
| parent | aa5a704756fe933d0c87c02657e4406866d36c1d (diff) | |
| parent | 086ee7a6200fa5ad795b12110b5b3d5a93dcac3e (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging
QAPI patches for 2017-07-12
# gpg: Signature made Wed 12 Jul 2017 17:07:20 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2017-07-12:
scripts: use build_ prefix for string not piped through cgen()
qobject: Update coccinelle script to catch Q{INC, DEC}REF
qobject: Catch another straggler for use of qdict_put_str()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c index 28022145d5..182e697f81 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -327,7 +327,7 @@ static int img_add_key_secrets(void *opaque, QDict *options = opaque; if (g_str_has_suffix(name, "key-secret")) { - qdict_put(options, name, qstring_from_str(value)); + qdict_put_str(options, name, value); } return 0; |