diff options
author | Markus Armbruster <armbru@redhat.com> | 2013-11-28 17:26:55 +0100 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-12-23 00:27:22 +0100 |
commit | 837d37167dc446af8a91189108b363c04609e296 (patch) | |
tree | c27d46dfca68603ff656476e139d2afc9c7ba260 /hw/core/sysbus.c | |
parent | efec3dd631d94160288392721a5f9c39e50fb2bc (diff) | |
download | qemu-837d37167dc446af8a91189108b363c04609e296.zip qemu-837d37167dc446af8a91189108b363c04609e296.tar.gz qemu-837d37167dc446af8a91189108b363c04609e296.tar.bz2 |
sysbus: Set cannot_instantiate_with_device_add_yet
device_add plugs devices into suitable bus. For "real" buses, that
actually connects the device. For sysbus, the connections need to be
made separately, and device_add can't do that. The device would be
left unconnected, and could not possibly work.
Quite a few, but not all sysbus devices already set
cannot_instantiate_with_device_add_yet in their class init function.
Set it in their abstract base's class init function
sysbus_device_class_init(), and remove the now redundant assignments
from device class init functions.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/core/sysbus.c')
-rw-r--r-- | hw/core/sysbus.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 146f50a..f4e760d 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -257,6 +257,13 @@ static void sysbus_device_class_init(ObjectClass *klass, void *data) DeviceClass *k = DEVICE_CLASS(klass); k->init = sysbus_device_init; k->bus_type = TYPE_SYSTEM_BUS; + /* + * device_add plugs devices into suitable bus. For "real" buses, + * that actually connects the device. For sysbus, the connections + * need to be made separately, and device_add can't do that. The + * device would be left unconnected, and could not possibly work. + */ + k->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo sysbus_device_type_info = { |