diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 12:43:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 12:43:07 +0100 |
| commit | 87ecd4f3408265fc6403dfbe34fb885057f804ec (patch) | |
| tree | 2e2dc15c2505d219bab39dee038d1d76ad2645ea /hw/misc/mmio_interface.c | |
| parent | 6fef22d7e650a5a7cad76c6115bea629e75eca9f (diff) | |
| parent | a808c0865b720e22ca2929ec3d362d4610fbad51 (diff) | |
| download | focaccia-qemu-87ecd4f3408265fc6403dfbe34fb885057f804ec.tar.gz focaccia-qemu-87ecd4f3408265fc6403dfbe34fb885057f804ec.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-08-14 # gpg: Signature made Mon 14 Aug 2017 12:07:03 BST # gpg: using RSA key 0x701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * remotes/mjt/tags/trivial-patches-fetch: hw/misc/mmio_interface: Return after error_setg() to avoid crash qemu-iotests: remove comment about root privileges requirement qemu-iotests: remove commented out variables qemu-iotests: get rid of _full_imgproto_details() qemu-doc: Fix "-net van" typo libqtest: Fix typo in comments unicore32: abort when entering "x 0" on the monitor Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
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", |