|
@@ -22,6 +22,7 @@
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/osdep.h"
|
|
#include "hw/platform-bus.h"
|
|
#include "hw/platform-bus.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/qdev-properties.h"
|
|
|
|
+#include "qapi/error.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/module.h"
|
|
#include "qemu/module.h"
|
|
|
|
|
|
@@ -63,9 +64,8 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev,
|
|
return -1;
|
|
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) {
|
|
if (parent_mr != pbus_mr_obj) {
|
|
/* MMIO region is not mapped on platform bus */
|
|
/* MMIO region is not mapped on platform bus */
|
|
return -1;
|
|
return -1;
|