diff options
| author | Markus Armbruster | 2013-11-28 17:26:55 +0100 |
|---|---|---|
| committer | Andreas Färber | 2013-12-23 00:27:22 +0100 |
| commit | 837d37167dc446af8a91189108b363c04609e296 (patch) | |
| tree | c27d46dfca68603ff656476e139d2afc9c7ba260 /hw/pci-host | |
| parent | qdev: Replace no_user by cannot_instantiate_with_device_add_yet (diff) | |
| download | qemu-837d37167dc446af8a91189108b363c04609e296.tar.gz qemu-837d37167dc446af8a91189108b363c04609e296.tar.xz qemu-837d37167dc446af8a91189108b363c04609e296.zip | |
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/pci-host')
| -rw-r--r-- | hw/pci-host/bonito.c | 2 | ||||
| -rw-r--r-- | hw/pci-host/grackle.c | 2 | ||||
| -rw-r--r-- | hw/pci-host/piix.c | 1 | ||||
| -rw-r--r-- | hw/pci-host/prep.c | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 2e08e9d801..bfb9820336 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -819,11 +819,9 @@ static const TypeInfo bonito_info = { static void bonito_pcihost_class_init(ObjectClass *klass, void *data) { - DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = bonito_pcihost_initfn; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ } static const TypeInfo bonito_pcihost_info = { diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index ba6017fc52..b0da33dbe8 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -143,10 +143,8 @@ static const TypeInfo grackle_pci_info = { static void pci_grackle_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - DeviceClass *dc = DEVICE_CLASS(klass); k->init = pci_grackle_init_device; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ } static const TypeInfo grackle_pci_host_info = { diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 333358e9e5..98ebe6cd00 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -727,7 +727,6 @@ static void i440fx_pcihost_class_init(ObjectClass *klass, void *data) hc->root_bus_path = i440fx_pcihost_root_bus_path; dc->realize = i440fx_pcihost_realize; dc->fw_name = "pci"; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ dc->props = i440fx_props; } diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 58b8c5eaa3..ebc40c6ab8 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -215,7 +215,6 @@ static void raven_pcihost_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->realize = raven_pcihost_realizefn; dc->fw_name = "pci"; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ } static const TypeInfo raven_pcihost_info = { |