openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2012-01-18 00:11:16 +00:00 committed by Alexander Graf
parent d5ee67549a
commit 0ae4699694
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/grackle_pci.c
View File

@ -71,7 +71,7 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
SysBusDevice *s; SysBusDevice *s;
GrackleState *d; GrackleState *d;
dev = qdev_create(NULL, "grackle"); dev = qdev_create(NULL, "grackle-pcihost");
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = sysbus_from_qdev(dev); s = sysbus_from_qdev(dev);
d = FROM_SYSBUS(GrackleState, s); d = FROM_SYSBUS(GrackleState, s);
@ -121,9 +121,10 @@ static int grackle_pci_host_init(PCIDevice *d)
return 0; return 0;
} }
static PCIDeviceInfo grackle_pci_host_info = { static PCIDeviceInfo grackle_pci_info = {
.qdev.name = "grackle", .qdev.name = "grackle",
.qdev.size = sizeof(PCIDevice), .qdev.size = sizeof(PCIDevice),
.qdev.no_user = 1,
.init = grackle_pci_host_init, .init = grackle_pci_host_init,
.vendor_id = PCI_VENDOR_ID_MOTOROLA, .vendor_id = PCI_VENDOR_ID_MOTOROLA,
.device_id = PCI_DEVICE_ID_MOTOROLA_MPC106, .device_id = PCI_DEVICE_ID_MOTOROLA_MPC106,
@ -131,11 +132,17 @@ static PCIDeviceInfo grackle_pci_host_info = {
.class_id = PCI_CLASS_BRIDGE_HOST, .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) static void grackle_register_devices(void)
{ {
sysbus_register_dev("grackle", sizeof(GrackleState), sysbus_register_withprop(&grackle_pci_host_info);
pci_grackle_init_device); pci_qdev_register(&grackle_pci_info);
pci_qdev_register(&grackle_pci_host_info);
} }
device_init(grackle_register_devices) device_init(grackle_register_devices)