Commit 73093354 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

qdev: change ambiguous qdev names 



Reported-by: default avatarBlue Swirl <blauwirbel@gmail.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 19b6914a

hw/apb_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, 
        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 */

    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 = {

    .name = "pbm",

    .name = "pbm-pci",

    .size = sizeof(PCIDevice),

    .class_init = pbm_pci_host_class_init,

};

hw/dec_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data) 
}



static DeviceInfo pci_dec_21154_device_info = {

    .name = "dec-21154",

    .name = "dec-21154-sysbus",

    .size = sizeof(DECState),

    .class_init = pci_dec_21154_device_class_init,

};

hw/spapr_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void spapr_main_pci_host_class_init(ObjectClass *klass, void *data) 
}



static DeviceInfo spapr_main_pci_host_info = {

    .name = "spapr-pci-host-bridge",

    .name = "spapr-pci-host-bridge-pci",

    .size = sizeof(PCIDevice),

    .class_init = spapr_main_pci_host_class_init,

};

qom/object.c

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ TypeImpl *type_register(const TypeInfo *info) 


    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->parent = g_strdup(info->parent);