diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:05:51 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:08 +0200 |
| commit | 552d7f49eebdb1c84ab6dc7d93bd152fd885af31 (patch) | |
| tree | ba2ab90bff80624c63ee6c9bef8440e1e47d48f1 /hw/core/platform-bus.c | |
| parent | 90c69fb9fdd71f5e615145fd1dc43cdef61737b3 (diff) | |
| download | qemu-552d7f49eebdb1c84ab6dc7d93bd152fd885af31.zip qemu-552d7f49eebdb1c84ab6dc7d93bd152fd885af31.tar.gz qemu-552d7f49eebdb1c84ab6dc7d93bd152fd885af31.tar.bz2 | |
qom: Crash more nicely on object_property_get_link() failure
Pass &error_abort instead of NULL where the returned value is
dereferenced or asserted to be non-null. Drop a now redundant
assertion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-24-armbru@redhat.com>
Diffstat (limited to 'hw/core/platform-bus.c')
| -rw-r--r-- | hw/core/platform-bus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index d494e5c..5037ca2 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/platform-bus.h" #include "hw/qdev-properties.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" @@ -63,9 +64,8 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev, return -1; } - parent_mr = object_property_get_link(OBJECT(sbdev_mr), "container", NULL); - - assert(parent_mr); + parent_mr = object_property_get_link(OBJECT(sbdev_mr), "container", + &error_abort); if (parent_mr != pbus_mr_obj) { /* MMIO region is not mapped on platform bus */ return -1; |