diff options
| author | Thomas Huth <thuth@redhat.com> | 2017-08-14 08:10:29 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2017-08-14 13:06:54 +0300 |
| commit | a808c0865b720e22ca2929ec3d362d4610fbad51 (patch) | |
| tree | 7a9c6edd33e062b376e2374e88aa75081ffb720b /hw/misc/mmio_interface.c | |
| parent | a3e08c2dbd7db9b86e174f5e50c6aa7a59a2b21d (diff) | |
| download | focaccia-qemu-a808c0865b720e22ca2929ec3d362d4610fbad51.tar.gz focaccia-qemu-a808c0865b720e22ca2929ec3d362d4610fbad51.zip | |
hw/misc/mmio_interface: Return after error_setg() to avoid crash
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>
Diffstat (limited to 'hw/misc/mmio_interface.c')
| -rw-r--r-- | hw/misc/mmio_interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
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", |