OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qdev: change ambiguous qdev names

Browse Source 
Reported-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2012-01-25 13:37:36 -06:00
parent 19b6914a00
commit 7309335441
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/apb_pci.c
View File

@ -350,7 +350,7 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base,
sysbus_connect_irq(s, i, pic[i]); sysbus_connect_irq(s, i, pic[i]);
} }
pci_create_simple(d->bus, 0, "pbm"); pci_create_simple(d->bus, 0, "pbm-pci");
/* APB secondary busses */ /* APB secondary busses */
pci_dev = pci_create_multifunction(d->bus, PCI_DEVFN(1, 0), true, pci_dev = pci_create_multifunction(d->bus, PCI_DEVFN(1, 0), true,
@ -448,7 +448,7 @@ static void pbm_pci_host_class_init(ObjectClass *klass, void *data)
} }
static DeviceInfo pbm_pci_host_info = { static DeviceInfo pbm_pci_host_info = {
.name = "pbm", .name = "pbm-pci",
.size = sizeof(PCIDevice), .size = sizeof(PCIDevice),
.class_init = pbm_pci_host_class_init, .class_init = pbm_pci_host_class_init,
}; };

2
hw/dec_pci.c
View File

@ -131,7 +131,7 @@ static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data)
} }
static DeviceInfo pci_dec_21154_device_info = { static DeviceInfo pci_dec_21154_device_info = {
.name = "dec-21154", .name = "dec-21154-sysbus",
.size = sizeof(DECState), .size = sizeof(DECState),
.class_init = pci_dec_21154_device_class_init, .class_init = pci_dec_21154_device_class_init,
}; };

2
hw/spapr_pci.c
View File

@ -222,7 +222,7 @@ static void spapr_main_pci_host_class_init(ObjectClass *klass, void *data)
} }
static DeviceInfo spapr_main_pci_host_info = { static DeviceInfo spapr_main_pci_host_info = {
.name = "spapr-pci-host-bridge", .name = "spapr-pci-host-bridge-pci",
.size = sizeof(PCIDevice), .size = sizeof(PCIDevice),
.class_init = spapr_main_pci_host_class_init, .class_init = spapr_main_pci_host_class_init,
}; };

5
qom/object.c
View File

@ -87,6 +87,11 @@ TypeImpl *type_register(const TypeInfo *info)
g_assert(info->name != NULL); g_assert(info->name != NULL);
if (type_table_lookup(info->name) != NULL) {
fprintf(stderr, "Registering `%s' which already exists\n", info->name);
abort();
}
ti->name = g_strdup(info->name); ti->name = g_strdup(info->name);
ti->parent = g_strdup(info->parent); ti->parent = g_strdup(info->parent);