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

qdev: Improve uni-north device names 

Switch to the names suggested by Blue Swirl.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2009-12-14 10:41:21 +01:00 committed by Anthony Liguori
parent 2dd650e58a
commit 18dd19a7d9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/unin_pci.c
View File

@ -148,7 +148,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
/* Use values found on a real PowerMac */ /* Use values found on a real PowerMac */
/* Uninorth main bus */ /* Uninorth main bus */
dev = qdev_create(NULL, "uni-north-main"); dev = qdev_create(NULL, "uni-north");
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = sysbus_from_qdev(dev); s = sysbus_from_qdev(dev);
d = FROM_SYSBUS(UNINState, s); d = FROM_SYSBUS(UNINState, s);
@ -157,7 +157,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
pic, 11 << 3, 4); pic, 11 << 3, 4);
#if 0 #if 0
pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-main"); pci_create_simple(d->host_state.bus, 11 << 3, "uni-north");
#endif #endif
sysbus_mmio_map(s, 0, 0xf2800000); sysbus_mmio_map(s, 0, 0xf2800000);
@ -170,8 +170,8 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
#endif #endif
/* Uninorth AGP bus */ /* Uninorth AGP bus */
pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-AGP"); pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-agp");
dev = qdev_create(NULL, "uni-north-AGP"); dev = qdev_create(NULL, "uni-north-agp");
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = sysbus_from_qdev(dev); s = sysbus_from_qdev(dev);
sysbus_mmio_map(s, 0, 0xf0800000); sysbus_mmio_map(s, 0, 0xf0800000);
@ -180,8 +180,8 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
/* Uninorth internal bus */ /* Uninorth internal bus */
#if 0 #if 0
/* XXX: not needed for now */ /* XXX: not needed for now */
pci_create_simple(d->host_state.bus, 14 << 3, "uni-north-internal"); pci_create_simple(d->host_state.bus, 14 << 3, "uni-north-pci");
dev = qdev_create(NULL, "uni-north-internal"); dev = qdev_create(NULL, "uni-north-pci");
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = sysbus_from_qdev(dev); s = sysbus_from_qdev(dev);
sysbus_mmio_map(s, 0, 0xf4800000); sysbus_mmio_map(s, 0, 0xf4800000);
@ -260,7 +260,7 @@ static int unin_internal_pci_host_init(PCIDevice *d)
} }
static PCIDeviceInfo unin_main_pci_host_info = { static PCIDeviceInfo unin_main_pci_host_info = {
.qdev.name = "uni-north-main", .qdev.name = "uni-north",
.qdev.size = sizeof(PCIDevice), .qdev.size = sizeof(PCIDevice),
.init = unin_main_pci_host_init, .init = unin_main_pci_host_init,
}; };
@ -272,29 +272,29 @@ static PCIDeviceInfo dec_21154_pci_host_info = {
}; };
static PCIDeviceInfo unin_agp_pci_host_info = { static PCIDeviceInfo unin_agp_pci_host_info = {
.qdev.name = "uni-north-AGP", .qdev.name = "uni-north-agp",
.qdev.size = sizeof(PCIDevice), .qdev.size = sizeof(PCIDevice),
.init = unin_agp_pci_host_init, .init = unin_agp_pci_host_init,
}; };
static PCIDeviceInfo unin_internal_pci_host_info = { static PCIDeviceInfo unin_internal_pci_host_info = {
.qdev.name = "uni-north-internal", .qdev.name = "uni-north-pci",
.qdev.size = sizeof(PCIDevice), .qdev.size = sizeof(PCIDevice),
.init = unin_internal_pci_host_init, .init = unin_internal_pci_host_init,
}; };
static void unin_register_devices(void) static void unin_register_devices(void)
{ {
sysbus_register_dev("uni-north-main", sizeof(UNINState), sysbus_register_dev("uni-north", sizeof(UNINState),
pci_unin_main_init_device); pci_unin_main_init_device);
pci_qdev_register(&unin_main_pci_host_info); pci_qdev_register(&unin_main_pci_host_info);
sysbus_register_dev("dec-21154", sizeof(UNINState), sysbus_register_dev("dec-21154", sizeof(UNINState),
pci_dec_21154_init_device); pci_dec_21154_init_device);
pci_qdev_register(&dec_21154_pci_host_info); pci_qdev_register(&dec_21154_pci_host_info);
sysbus_register_dev("uni-north-AGP", sizeof(UNINState), sysbus_register_dev("uni-north-agp", sizeof(UNINState),
pci_unin_agp_init_device); pci_unin_agp_init_device);
pci_qdev_register(&unin_agp_pci_host_info); pci_qdev_register(&unin_agp_pci_host_info);
sysbus_register_dev("uni-north-internal", sizeof(UNINState), sysbus_register_dev("uni-north-pci", sizeof(UNINState),
pci_unin_internal_init_device); pci_unin_internal_init_device);
pci_qdev_register(&unin_internal_pci_host_info); pci_qdev_register(&unin_internal_pci_host_info);
} }