diff options
author | Markus Armbruster <armbru@redhat.com> | 2013-11-28 17:26:58 +0100 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-12-23 00:27:23 +0100 |
commit | 08c58f92f66dcf0a9097c3a6a65bcc4ffd71268f (patch) | |
tree | 25c48490e35cfaeae55d5f9370f479a4a56271a0 /hw/sh4 | |
parent | f37a4374bae20ca678b808b5ee32319e943b1b4b (diff) | |
download | qemu-08c58f92f66dcf0a9097c3a6a65bcc4ffd71268f.zip qemu-08c58f92f66dcf0a9097c3a6a65bcc4ffd71268f.tar.gz qemu-08c58f92f66dcf0a9097c3a6a65bcc4ffd71268f.tar.bz2 |
pci-host: Consistently set cannot_instantiate_with_device_add_yet
Many PCI host bridges consist of a sysbus device and a PCI device.
You need both for the thing to work. Arguably, these bridges should
be modelled as a single, composite devices instead of pairs of
seemingly independent devices you can only use together, but we're not
there, yet.
Since the sysbus part can't be instantiated with device_add, yet,
permitting it with the PCI part is useless. We shouldn't offer
useless options to the user, so let's set
cannot_instantiate_with_device_add_yet for them.
It's already set for Bonito, Grackle, i440FX and Raven. Document why.
Set it for the others: dec-21154, e500-host-bridge, gt64120_pci, mch,
pbm-pci, ppc4xx-host-bridge, sh_pci_host, u3-agp, uni-north-agp,
uni-north-internal-pci, uni-north-pci, and versatile_pci_host.
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/sh4')
-rw-r--r-- | hw/sh4/sh_pci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index e81176a..a2f6d9e 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -162,10 +162,16 @@ static int sh_pci_host_init(PCIDevice *d) static void sh_pci_host_class_init(ObjectClass *klass, void *data) { PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); k->init = sh_pci_host_init; k->vendor_id = PCI_VENDOR_ID_HITACHI; k->device_id = PCI_DEVICE_ID_HITACHI_SH7751R; + /* + * PCI-facing part of the host bridge, not usable without the + * host-facing part, which can't be device_add'ed, yet. + */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo sh_pci_host_info = { |