mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-25 20:03:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

hw/misc/mmio_interface: Return after error_setg() to avoid crash

Browse Source 
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 <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Thomas Huth 2017-08-14 08:10:29 +02:00 committed by Michael Tokarev
parent a3e08c2dbd
commit a808c0865b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/misc/mmio_interface.c
View File

@ -63,10 +63,12 @@ static void mmio_interface_realize(DeviceState *dev, Error **errp)
if (!s->host_ptr) { if (!s->host_ptr) {
error_setg(errp, "host_ptr property must be set"); error_setg(errp, "host_ptr property must be set");
return;
} }
if (!s->subregion) { if (!s->subregion) {
error_setg(errp, "subregion property must be set"); error_setg(errp, "subregion property must be set");
return;
} }
memory_region_init_ram_ptr(&s->ram_mem, OBJECT(s), "ram", memory_region_init_ram_ptr(&s->ram_mem, OBJECT(s), "ram",