This would have caught some of the bugs I just fixed. Signed-off-by: Markus Armbruster <arm...@redhat.com> --- hw/core/qdev.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 9e5538aeae..0df995eb94 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -97,6 +97,11 @@ static void bus_add_child(BusState *bus, DeviceState *child) void qdev_set_parent_bus(DeviceState *dev, BusState *bus) { BusState *old_parent_bus = dev->parent_bus; + DeviceClass *dc = DEVICE_GET_CLASS(dev); + + assert(dc->bus_type + ? bus && object_dynamic_cast(OBJECT(bus), dc->bus_type) + : !bus); if (old_parent_bus) { trace_qdev_update_parent_bus(dev, object_get_typename(OBJECT(dev)), -- 2.21.1