diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-01-18 00:11:16 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-01-21 05:17:04 +0100 |
| commit | 0ae469969484e93354f307971b3425bafe51cb35 (patch) | |
| tree | c128074d3b9ea2e06bc7175c48fc1f026443875a | |
| parent | d5ee67549a9b51c5a62831f506e33286923fbbd9 (diff) | |
grackle_pci: Clean up qdev names
Rename SysBus device from 'grackle' to 'grackle-pcihost' to resolve a
name conflict.
Also mark both devices as no_user.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Alexander Graf <agraf@suse.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/grackle_pci.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 1e529fb5d0..be10a6d5a3 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -71,7 +71,7 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, SysBusDevice *s; GrackleState *d; - dev = qdev_create(NULL, "grackle"); + dev = qdev_create(NULL, "grackle-pcihost"); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); d = FROM_SYSBUS(GrackleState, s); @@ -121,9 +121,10 @@ static int grackle_pci_host_init(PCIDevice *d) return 0; } -static PCIDeviceInfo grackle_pci_host_info = { +static PCIDeviceInfo grackle_pci_info = { .qdev.name = "grackle", .qdev.size = sizeof(PCIDevice), + .qdev.no_user = 1, .init = grackle_pci_host_init, .vendor_id = PCI_VENDOR_ID_MOTOROLA, .device_id = PCI_DEVICE_ID_MOTOROLA_MPC106, @@ -131,11 +132,17 @@ static PCIDeviceInfo grackle_pci_host_info = { .class_id = PCI_CLASS_BRIDGE_HOST, }; +static SysBusDeviceInfo grackle_pci_host_info = { + .qdev.name = "grackle-pcihost", + .qdev.size = sizeof(GrackleState), + .qdev.no_user = 1, + .init = pci_grackle_init_device, +}; + static void grackle_register_devices(void) { - sysbus_register_dev("grackle", sizeof(GrackleState), - pci_grackle_init_device); - pci_qdev_register(&grackle_pci_host_info); + sysbus_register_withprop(&grackle_pci_host_info); + pci_qdev_register(&grackle_pci_info); } device_init(grackle_register_devices) |