aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-06-10 07:32:35 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-06-15 22:06:04 +0200
commitcfe91404c516551de88afbe57433a39dcdacf3c4 (patch)
treeaf621a70fcb659aa21fd57fe8c419c594e97ab52
parent3c6ef471ee67bf5a22a9e0ecfdc45ca7d2393216 (diff)
qdev: Drop qdev_realize() support for null bus
The "null @bus means main system bus" convenience feature is no longer used. Drop it. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200610053247.1583243-47-armbru@redhat.com>
-rw-r--r--hw/core/qdev.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index a1fdebb3aa..78a06db76e 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -408,8 +408,7 @@ void qdev_init_nofail(DeviceState *dev)
/*
* Realize @dev.
* @dev must not be plugged into a bus.
- * Plug @dev into @bus if non-null, else into the main system bus.
- * This takes a reference to @dev.
+ * Plug @dev into @bus. This takes a reference to @dev.
* If @dev has no QOM parent, make one up, taking another reference.
* On success, return true.
* On failure, store an error through @errp and return false.
@@ -419,18 +418,7 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)
Error *err = NULL;
assert(!dev->realized && !dev->parent_bus);
-
- if (!bus) {
- /*
- * Assert that the device really is a SysBusDevice before we
- * put it onto the sysbus. Non-sysbus devices which aren't
- * being put onto a bus should be realized with
- * object_property_set_bool(OBJECT(dev), true, "realized",
- * errp);
- */
- g_assert(object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE));
- bus = sysbus_get_default();
- }
+ assert(bus);
qdev_set_parent_bus(dev, bus);