[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/20] Drop superfluous conditionals around qemu_opts
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 07/20] Drop superfluous conditionals around qemu_opts_del() |
Date: |
Thu, 11 Dec 2014 21:15:55 +0300 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/core/qdev.c | 4 +---
qemu-char.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 35fd00d..901f289 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -1141,9 +1141,7 @@ static void device_finalize(Object *obj)
NamedGPIOList *ngl, *next;
DeviceState *dev = DEVICE(obj);
- if (dev->opts) {
- qemu_opts_del(dev->opts);
- }
+ qemu_opts_del(dev->opts);
QLIST_FOREACH_SAFE(ngl, &dev->gpios, node, next) {
QLIST_REMOVE(ngl, node);
diff --git a/qemu-char.c b/qemu-char.c
index a8b01da..ef84b53 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3825,9 +3825,7 @@ void qemu_chr_delete(CharDriverState *chr)
}
g_free(chr->filename);
g_free(chr->label);
- if (chr->opts) {
- qemu_opts_del(chr->opts);
- }
+ qemu_opts_del(chr->opts);
g_free(chr);
}
--
2.1.3
- [Qemu-devel] [PULL 00/20] Trivial patches for 2014-12-11, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 05/20] virtio-bus: avoid breaking build when open DEBUG switch, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 04/20] acpi-build: Make DPRINTF working for acpi-build, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 03/20] acpi-build: adjust indention 8 -> 4 spaces, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 02/20] target-s390x: fix possible out of bounds read, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 06/20] usb: delete redundant brackets in usb_host_handle_control(), Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 15/20] qapi-schema: fix typo about change-vnc-password, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 07/20] Drop superfluous conditionals around qemu_opts_del(),
Michael Tokarev <=
- [Qemu-devel] [PULL 19/20] hpet: increase spelling precision, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 14/20] fw_cfg: remove superfluous blank line, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 01/20] qmp: fix typo in input-send-event examples, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 13/20] get_maintainer.pl: Remove the --git-chief-penguins option, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 11/20] util: Use g_new() & friends where that makes obvious sense, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 18/20] pflash_cfi02.c: associate "cfi.pflash02" to "Storage devices" category, Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 16/20] virtio: remove useless declaration of virtio_net_init(), Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 10/20] util: Fuse g_malloc(); memset() into g_new0(), Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 12/20] configure: Replace which(1) with "has", Michael Tokarev, 2014/12/11
- [Qemu-devel] [PULL 17/20] vt82c686: fix coverity warning about out-of-bounds write, Michael Tokarev, 2014/12/11