[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 7/7] hw/misc/mmio_interface: Return after error_set
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 7/7] hw/misc/mmio_interface: Return after error_setg() to avoid crash |
Date: |
Mon, 14 Aug 2017 14:07:44 +0300 |
From: Thomas Huth <address@hidden>
QEMU currently abort()s if the user tries to specify the mmio_interface
device without parameters:
x86_64-softmmu/qemu-system-x86_64 -nographic -device mmio_interface
qemu-system-x86_64: /home/thuth/devel/qemu/util/error.c:57: error_setv:
Assertion `*errp == ((void *)0)' failed.
Aborted (core dumped)
This happens because the realize function is trying to set the errp
twice in this case. After setting an error, the realize function
should immediately return instead.
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/misc/mmio_interface.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/misc/mmio_interface.c b/hw/misc/mmio_interface.c
index 6f004d2bab..da154e5c95 100644
--- a/hw/misc/mmio_interface.c
+++ b/hw/misc/mmio_interface.c
@@ -63,10 +63,12 @@ static void mmio_interface_realize(DeviceState *dev, Error
**errp)
if (!s->host_ptr) {
error_setg(errp, "host_ptr property must be set");
+ return;
}
if (!s->subregion) {
error_setg(errp, "subregion property must be set");
+ return;
}
memory_region_init_ram_ptr(&s->ram_mem, OBJECT(s), "ram",
--
2.11.0
- [Qemu-trivial] [PULL 0/7] Trivial patches for 2017-08-14, Michael Tokarev, 2017/08/14
- [Qemu-trivial] [PULL 6/7] qemu-iotests: remove comment about root privileges requirement, Michael Tokarev, 2017/08/14
- [Qemu-trivial] [PULL 3/7] qemu-doc: Fix "-net van" typo, Michael Tokarev, 2017/08/14
- [Qemu-trivial] [PULL 5/7] qemu-iotests: remove commented out variables, Michael Tokarev, 2017/08/14
- [Qemu-trivial] [PULL 2/7] libqtest: Fix typo in comments, Michael Tokarev, 2017/08/14
- [Qemu-trivial] [PULL 7/7] hw/misc/mmio_interface: Return after error_setg() to avoid crash,
Michael Tokarev <=
- Re: [Qemu-trivial] [Qemu-devel] [PULL 7/7] hw/misc/mmio_interface: Return after error_setg() to avoid crash, Igor Mammedov, 2017/08/14
[Qemu-trivial] [PULL 1/7] unicore32: abort when entering "x 0" on the monitor, Michael Tokarev, 2017/08/14
[Qemu-trivial] [PULL 4/7] qemu-iotests: get rid of _full_imgproto_details(), Michael Tokarev, 2017/08/14
Re: [Qemu-trivial] [Qemu-devel] [PULL 0/7] Trivial patches for 2017-08-14, Peter Maydell, 2017/08/14