diff options
| author | Peter Maydell | 2018-07-17 18:06:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-17 18:06:32 +0200 |
| commit | 59b5552f020b739e273e969a0933c23d8f4e2284 (patch) | |
| tree | ff90e006b6500ec58d0abb8d495a9a95151589f0 /util/qemu-option.c | |
| parent | hw/arm/xlnx-zynqmp: Fix crash when introspecting the "xlnx, zynqmp" device (diff) | |
| parent | Document command line options with single dash (diff) | |
| download | qemu-59b5552f020b739e273e969a0933c23d8f4e2284.tar.gz qemu-59b5552f020b739e273e969a0933c23d8f4e2284.tar.xz qemu-59b5552f020b739e273e969a0933c23d8f4e2284.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Bug fixes.
# gpg: Signature made Tue 17 Jul 2018 16:06:07 BST
# gpg: using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
Document command line options with single dash
opts: remove redundant check for NULL parameter
i386: only parse the initrd_filename once for multiboot modules
i386: fix regression parsing multiboot initrd modules
virtio-scsi: fix hotplug ->reset() vs event race
qdev: add HotplugHandler->post_plug() callback
hw/char/serial: retry write if EAGAIN
PC Chipset: Improve serial divisor calculation
vhost-user-test: added proper TestServer *dest initialization in test_migrate()
hyperv: ensure VP index equal to QEMU cpu_index
hyperv: rename vcpu_id to vp_index
accel: Fix typo and grammar in comment
dump: add kernel_gs_base to QEMU CPU state
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-option.c')
| -rw-r--r-- | util/qemu-option.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c index 19761e3eaf..01886efe90 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -82,11 +82,9 @@ const char *get_opt_value(const char *p, char **value) if (*offset != '\0' && *(offset + 1) == ',') { length++; } - if (value) { - *value = g_renew(char, *value, capacity + length + 1); - strncpy(*value + capacity, p, length); - (*value)[capacity + length] = '\0'; - } + *value = g_renew(char, *value, capacity + length + 1); + strncpy(*value + capacity, p, length); + (*value)[capacity + length] = '\0'; capacity += length; if (*offset == '\0' || *(offset + 1) != ',') { |