Revision 556cd098

b/hw/bt-hid.c
566 566

  
567 567
struct bt_device_s *bt_keyboard_init(struct bt_scatternet_s *net)
568 568
{
569
    USBDevice *dev = usb_create_simple(NULL /* FIXME */, "QEMU USB Keyboard");
569
    USBDevice *dev = usb_create_simple(NULL /* FIXME */, "usb-kbd");
570 570
    return bt_hid_init(net, dev, class_keyboard);
571 571
}
b/hw/cirrus_vga.c
3217 3217

  
3218 3218
void pci_cirrus_vga_init(PCIBus *bus)
3219 3219
{
3220
    pci_create_simple(bus, -1, "Cirrus VGA");
3220
    pci_create_simple(bus, -1, "cirrus-vga");
3221 3221
}
3222 3222

  
3223 3223
static PCIDeviceInfo cirrus_vga_info = {
3224
    .qdev.name    = "Cirrus VGA",
3224
    .qdev.name    = "cirrus-vga",
3225
    .qdev.desc    = "Cirrus CLGD 54xx VGA",
3225 3226
    .qdev.size    = sizeof(PCICirrusVGAState),
3226 3227
    .qdev.vmsd    = &vmstate_pci_cirrus_vga,
3227 3228
    .init         = pci_cirrus_vga_initfn,
b/hw/grackle_pci.c
178 178
};
179 179

  
180 180
static PCIDeviceInfo dec_21154_pci_host_info = {
181
    .qdev.name = "DEC 21154",
181
    .qdev.name = "dec-21154",
182 182
    .qdev.size = sizeof(PCIDevice),
183 183
    .init      = dec_21154_pci_host_init,
184 184
};
......
188 188
    sysbus_register_dev("grackle", sizeof(GrackleState),
189 189
                        pci_grackle_init_device);
190 190
    pci_qdev_register(&grackle_pci_host_info);
191
    sysbus_register_dev("DEC 21154", sizeof(GrackleState),
191
    sysbus_register_dev("dec-21154", sizeof(GrackleState),
192 192
                        pci_dec_21154_init_device);
193 193
    pci_qdev_register(&dec_21154_pci_host_info);
194 194
}
b/hw/ide/cmd646.c
245 245
{
246 246
    PCIDevice *dev;
247 247

  
248
    dev = pci_create(bus, -1, "CMD646 IDE");
248
    dev = pci_create(bus, -1, "cmd646-ide");
249 249
    qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled);
250 250
    qdev_init_nofail(&dev->qdev);
251 251

  
......
254 254

  
255 255
static PCIDeviceInfo cmd646_ide_info[] = {
256 256
    {
257
        .qdev.name    = "CMD646 IDE",
257
        .qdev.name    = "cmd646-ide",
258 258
        .qdev.size    = sizeof(PCIIDEState),
259 259
        .init         = pci_cmd646_ide_initfn,
260 260
        .qdev.props   = (Property[]) {
b/hw/ide/piix.c
161 161
{
162 162
    PCIDevice *dev;
163 163

  
164
    dev = pci_create_simple(bus, devfn, "PIIX3 IDE");
164
    dev = pci_create_simple(bus, devfn, "piix3-ide");
165 165
    pci_ide_create_devs(dev, hd_table);
166 166
}
167 167

  
......
171 171
{
172 172
    PCIDevice *dev;
173 173

  
174
    dev = pci_create_simple(bus, devfn, "PIIX4 IDE");
174
    dev = pci_create_simple(bus, devfn, "piix4-ide");
175 175
    pci_ide_create_devs(dev, hd_table);
176 176
}
177 177

  
178 178
static PCIDeviceInfo piix_ide_info[] = {
179 179
    {
180
        .qdev.name    = "PIIX3 IDE",
180
        .qdev.name    = "piix3-ide",
181 181
        .qdev.size    = sizeof(PCIIDEState),
182 182
        .qdev.no_user = 1,
183 183
        .init         = pci_piix3_ide_initfn,
184 184
    },{
185
        .qdev.name    = "PIIX4 IDE",
185
        .qdev.name    = "piix4-ide",
186 186
        .qdev.size    = sizeof(PCIIDEState),
187 187
        .qdev.no_user = 1,
188 188
        .init         = pci_piix4_ide_initfn,
b/hw/unin_pci.c
148 148

  
149 149
    /* Use values found on a real PowerMac */
150 150
    /* Uninorth main bus */
151
    dev = qdev_create(NULL, "Uni-north main");
151
    dev = qdev_create(NULL, "uni-north-main");
152 152
    qdev_init_nofail(dev);
153 153
    s = sysbus_from_qdev(dev);
154 154
    d = FROM_SYSBUS(UNINState, s);
......
157 157
                                         pic, 11 << 3, 4);
158 158

  
159 159
#if 0
160
    pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north main");
160
    pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-main");
161 161
#endif
162 162

  
163 163
    sysbus_mmio_map(s, 0, 0xf2800000);
......
166 166
    /* DEC 21154 bridge */
167 167
#if 0
168 168
    /* XXX: not activated as PPC BIOS doesn't handle multiple buses properly */
169
    pci_create_simple(d->host_state.bus, 12 << 3, "DEC 21154");
169
    pci_create_simple(d->host_state.bus, 12 << 3, "dec-21154");
170 170
#endif
171 171

  
172 172
    /* Uninorth AGP bus */
173
    pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north AGP");
174
    dev = qdev_create(NULL, "Uni-north AGP");
173
    pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-AGP");
174
    dev = qdev_create(NULL, "uni-north-AGP");
175 175
    qdev_init_nofail(dev);
176 176
    s = sysbus_from_qdev(dev);
177 177
    sysbus_mmio_map(s, 0, 0xf0800000);
......
180 180
    /* Uninorth internal bus */
181 181
#if 0
182 182
    /* XXX: not needed for now */
183
    pci_create_simple(d->host_state.bus, 14 << 3, "Uni-north internal");
184
    dev = qdev_create(NULL, "Uni-north internal");
183
    pci_create_simple(d->host_state.bus, 14 << 3, "uni-north-internal");
184
    dev = qdev_create(NULL, "uni-north-internal");
185 185
    qdev_init_nofail(dev);
186 186
    s = sysbus_from_qdev(dev);
187 187
    sysbus_mmio_map(s, 0, 0xf4800000);
......
260 260
}
261 261

  
262 262
static PCIDeviceInfo unin_main_pci_host_info = {
263
    .qdev.name = "Uni-north main",
263
    .qdev.name = "uni-north-main",
264 264
    .qdev.size = sizeof(PCIDevice),
265 265
    .init      = unin_main_pci_host_init,
266 266
};
267 267

  
268 268
static PCIDeviceInfo dec_21154_pci_host_info = {
269
    .qdev.name = "DEC 21154",
269
    .qdev.name = "dec-21154",
270 270
    .qdev.size = sizeof(PCIDevice),
271 271
    .init      = dec_21154_pci_host_init,
272 272
};
273 273

  
274 274
static PCIDeviceInfo unin_agp_pci_host_info = {
275
    .qdev.name = "Uni-north AGP",
275
    .qdev.name = "uni-north-AGP",
276 276
    .qdev.size = sizeof(PCIDevice),
277 277
    .init      = unin_agp_pci_host_init,
278 278
};
279 279

  
280 280
static PCIDeviceInfo unin_internal_pci_host_info = {
281
    .qdev.name = "Uni-north internal",
281
    .qdev.name = "uni-north-internal",
282 282
    .qdev.size = sizeof(PCIDevice),
283 283
    .init      = unin_internal_pci_host_init,
284 284
};
285 285

  
286 286
static void unin_register_devices(void)
287 287
{
288
    sysbus_register_dev("Uni-north main", sizeof(UNINState),
288
    sysbus_register_dev("uni-north-main", sizeof(UNINState),
289 289
                        pci_unin_main_init_device);
290 290
    pci_qdev_register(&unin_main_pci_host_info);
291
    sysbus_register_dev("DEC 21154", sizeof(UNINState),
291
    sysbus_register_dev("dec-21154", sizeof(UNINState),
292 292
                        pci_dec_21154_init_device);
293 293
    pci_qdev_register(&dec_21154_pci_host_info);
294
    sysbus_register_dev("Uni-north AGP", sizeof(UNINState),
294
    sysbus_register_dev("uni-north-AGP", sizeof(UNINState),
295 295
                        pci_unin_agp_init_device);
296 296
    pci_qdev_register(&unin_agp_pci_host_info);
297
    sysbus_register_dev("Uni-north internal", sizeof(UNINState),
297
    sysbus_register_dev("uni-north-internal", sizeof(UNINState),
298 298
                        pci_unin_internal_init_device);
299 299
    pci_qdev_register(&unin_internal_pci_host_info);
300 300
}
b/hw/usb-bt.c
630 630

  
631 631
    if (!hci)
632 632
        return NULL;
633
    dev = usb_create_simple(NULL /* FIXME */, "QEMU BT dongle");
633
    dev = usb_create_simple(NULL /* FIXME */, "usb-bt-dongle");
634 634
    s = DO_UPCAST(struct USBBtState, dev, dev);
635 635
    s->dev.opaque = s;
636 636

  
......
646 646

  
647 647
static struct USBDeviceInfo bt_info = {
648 648
    .product_desc   = "QEMU BT dongle",
649
    .qdev.name      = "QEMU BT dongle",
649
    .qdev.name      = "usb-bt-dongle",
650 650
    .qdev.size      = sizeof(struct USBBtState),
651 651
    .init           = usb_bt_initfn,
652 652
    .handle_packet  = usb_generic_handle_packet,
b/hw/usb-bus.c
153 153

  
154 154
    if (bus->nfree == 1) {
155 155
        /* Create a new hub and chain it on.  */
156
        hub = usb_create_simple(bus, "QEMU USB Hub");
156
        hub = usb_create_simple(bus, "usb-hub");
157 157
    }
158 158
    do_attach(dev);
159 159
    return 0;
b/hw/usb-hid.c
881 881
static struct USBDeviceInfo hid_info[] = {
882 882
    {
883 883
        .product_desc   = "QEMU USB Tablet",
884
        .qdev.name      = "QEMU USB Tablet",
885
        .qdev.alias     = "usb-tablet",
884
        .qdev.name      = "usb-tablet",
886 885
        .usbdevice_name = "tablet",
887 886
        .qdev.size      = sizeof(USBHIDState),
888 887
        .init           = usb_tablet_initfn,
......
893 892
        .handle_destroy = usb_hid_handle_destroy,
894 893
    },{
895 894
        .product_desc   = "QEMU USB Mouse",
896
        .qdev.name      = "QEMU USB Mouse",
897
        .qdev.alias     = "usb-mouse",
895
        .qdev.name      = "usb-mouse",
898 896
        .usbdevice_name = "mouse",
899 897
        .qdev.size      = sizeof(USBHIDState),
900 898
        .init           = usb_mouse_initfn,
......
905 903
        .handle_destroy = usb_hid_handle_destroy,
906 904
    },{
907 905
        .product_desc   = "QEMU USB Keyboard",
908
        .qdev.name      = "QEMU USB Keyboard",
909
        .qdev.alias     = "usb-kbd",
906
        .qdev.name      = "usb-kbd",
910 907
        .usbdevice_name = "keyboard",
911 908
        .qdev.size      = sizeof(USBHIDState),
912 909
        .init           = usb_keyboard_initfn,
b/hw/usb-hub.c
545 545

  
546 546
static struct USBDeviceInfo hub_info = {
547 547
    .product_desc   = "QEMU USB Hub",
548
    .qdev.name      = "QEMU USB Hub",
548
    .qdev.name      = "usb-hub",
549 549
    .qdev.size      = sizeof(USBHubState),
550 550
    .init           = usb_hub_initfn,
551 551
    .handle_packet  = usb_hub_handle_packet,
b/hw/usb-msd.c
591 591
    }
592 592

  
593 593
    /* create guest device */
594
    dev = usb_create(NULL /* FIXME */, "QEMU USB MSD");
594
    dev = usb_create(NULL /* FIXME */, "usb-storage");
595 595
    qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
596 596
    if (qdev_init(&dev->qdev) < 0)
597 597
        return NULL;
......
601 601

  
602 602
static struct USBDeviceInfo msd_info = {
603 603
    .product_desc   = "QEMU USB MSD",
604
    .qdev.name      = "QEMU USB MSD",
605
    .qdev.alias     = "usb-storage",
604
    .qdev.name      = "usb-storage",
606 605
    .qdev.size      = sizeof(MSDState),
607 606
    .init           = usb_msd_initfn,
608 607
    .handle_packet  = usb_generic_handle_packet,
b/hw/usb-net.c
1463 1463
    USBDevice *dev;
1464 1464
    USBNetState *s;
1465 1465

  
1466
    dev = usb_create_simple(NULL /* FIXME */, "QEMU USB Network Interface");
1466
    dev = usb_create_simple(NULL /* FIXME */, "usb-net");
1467 1467
    s = DO_UPCAST(USBNetState, dev, dev);
1468 1468

  
1469 1469
    memcpy(s->conf.macaddr.a, nd->macaddr, sizeof(nd->macaddr));
......
1488 1488

  
1489 1489
static struct USBDeviceInfo net_info = {
1490 1490
    .product_desc   = "QEMU USB Network Interface",
1491
    .qdev.name      = "QEMU USB Network Interface",
1491
    .qdev.name      = "usb-net",
1492 1492
    .qdev.size      = sizeof(USBNetState),
1493 1493
    .init           = usb_net_initfn,
1494 1494
    .handle_packet  = usb_generic_handle_packet,
b/hw/usb-ohci.c
1736 1736

  
1737 1737
void usb_ohci_init_pci(struct PCIBus *bus, int devfn)
1738 1738
{
1739
    pci_create_simple(bus, devfn, "OHCI USB PCI");
1739
    pci_create_simple(bus, devfn, "pci-ohci");
1740 1740
}
1741 1741

  
1742 1742
void usb_ohci_init_pxa(target_phys_addr_t base, int num_ports, int devfn,
......
1762 1762
}
1763 1763

  
1764 1764
static PCIDeviceInfo ohci_info = {
1765
    .qdev.name    = "OHCI USB PCI",
1766
    .qdev.alias   = "pci-ohci",
1765
    .qdev.name    = "pci-ohci",
1767 1766
    .qdev.desc    = "Apple USB Controller",
1768 1767
    .qdev.size    = sizeof(OHCIPCIState),
1769 1768
    .init         = usb_ohci_initfn_pci,
b/hw/usb-serial.c
577 577
    if (!cdrv)
578 578
        return NULL;
579 579

  
580
    dev = usb_create(NULL /* FIXME */, "QEMU USB Serial");
580
    dev = usb_create(NULL /* FIXME */, "usb-serial");
581 581
    qdev_prop_set_chr(&dev->qdev, "chardev", cdrv);
582 582
    if (vendorid)
583 583
        qdev_prop_set_uint16(&dev->qdev, "vendorid", vendorid);
......
597 597
    if (!cdrv)
598 598
        return NULL;
599 599

  
600
    dev = usb_create(NULL /* FIXME */, "QEMU USB Braille");
600
    dev = usb_create(NULL /* FIXME */, "usb-braille");
601 601
    qdev_prop_set_chr(&dev->qdev, "chardev", cdrv);
602 602
    qdev_init(&dev->qdev);
603 603

  
......
606 606

  
607 607
static struct USBDeviceInfo serial_info = {
608 608
    .product_desc   = "QEMU USB Serial",
609
    .qdev.name      = "QEMU USB Serial",
610
    .qdev.alias     = "usb-serial",
609
    .qdev.name      = "usb-serial",
611 610
    .qdev.size      = sizeof(USBSerialState),
612 611
    .init           = usb_serial_initfn,
613 612
    .handle_packet  = usb_generic_handle_packet,
......
627 626

  
628 627
static struct USBDeviceInfo braille_info = {
629 628
    .product_desc   = "QEMU USB Braille",
630
    .qdev.name      = "QEMU USB Braille",
631
    .qdev.alias     = "usb-braille",
629
    .qdev.name      = "usb-braille",
632 630
    .qdev.size      = sizeof(USBSerialState),
633 631
    .init           = usb_serial_initfn,
634 632
    .handle_packet  = usb_generic_handle_packet,
b/hw/usb-uhci.c
1111 1111

  
1112 1112
static PCIDeviceInfo uhci_info[] = {
1113 1113
    {
1114
        .qdev.name    = "PIIX3 USB-UHCI",
1114
        .qdev.name    = "piix3-usb-uhci",
1115 1115
        .qdev.size    = sizeof(UHCIState),
1116 1116
        .qdev.vmsd    = &vmstate_uhci,
1117 1117
        .init         = usb_uhci_piix3_initfn,
1118 1118
    },{
1119
        .qdev.name    = "PIIX4 USB-UHCI",
1119
        .qdev.name    = "piix4-usb-uhci",
1120 1120
        .qdev.size    = sizeof(UHCIState),
1121 1121
        .qdev.vmsd    = &vmstate_uhci,
1122 1122
        .init         = usb_uhci_piix4_initfn,
......
1133 1133

  
1134 1134
void usb_uhci_piix3_init(PCIBus *bus, int devfn)
1135 1135
{
1136
    pci_create_simple(bus, devfn, "PIIX3 USB-UHCI");
1136
    pci_create_simple(bus, devfn, "piix3-usb-uhci");
1137 1137
}
1138 1138

  
1139 1139
void usb_uhci_piix4_init(PCIBus *bus, int devfn)
1140 1140
{
1141
    pci_create_simple(bus, devfn, "PIIX4 USB-UHCI");
1141
    pci_create_simple(bus, devfn, "piix4-usb-uhci");
1142 1142
}
b/hw/usb-wacom.c
410 410

  
411 411
static struct USBDeviceInfo wacom_info = {
412 412
    .product_desc   = "QEMU PenPartner Tablet",
413
    .qdev.name      = "QEMU PenPartner Tablet",
414
    .qdev.alias     = "wacom-tablet",
413
    .qdev.name      = "usb-wacom-tablet",
414
    .qdev.desc      = "QEMU PenPartner Tablet",
415 415
    .usbdevice_name = "wacom-tablet",
416 416
    .qdev.size      = sizeof(USBWacomState),
417 417
    .init           = usb_wacom_initfn,
b/hw/vmware_vga.c
1196 1196

  
1197 1197
void pci_vmsvga_init(PCIBus *bus)
1198 1198
{
1199
    pci_create_simple(bus, -1, "QEMUware SVGA");
1199
    pci_create_simple(bus, -1, "vmware-svga");
1200 1200
}
1201 1201

  
1202 1202
static PCIDeviceInfo vmsvga_info = {
1203
    .qdev.name    = "QEMUware SVGA",
1203
    .qdev.name    = "vmware-svga",
1204 1204
    .qdev.size    = sizeof(struct pci_vmsvga_state_s),
1205 1205
    .qdev.vmsd    = &vmstate_vmware_vga,
1206 1206
    .init         = pci_vmsvga_initfn,
b/usb-bsd.c
361 361
            goto fail;
362 362
        }
363 363

  
364
        d = usb_create(NULL /* FIXME */, "USB Host Device");
364
        d = usb_create(NULL /* FIXME */, "usb-host");
365 365
        dev = DO_UPCAST(USBHostDevice, dev, d);
366 366

  
367 367
        if (dev_info.udi_speed == 1)
......
394 394

  
395 395
static struct USBDeviceInfo usb_host_dev_info = {
396 396
    .product_desc   = "USB Host Device",
397
    .qdev.name      = "USB Host Device",
397
    .qdev.name      = "usb-host",
398 398
    .qdev.size      = sizeof(USBHostDevice),
399 399
    .init           = usb_host_initfn,
400 400
    .handle_packet  = usb_generic_handle_packet,
b/usb-linux.c
980 980

  
981 981
static struct USBDeviceInfo usb_host_dev_info = {
982 982
    .product_desc   = "USB Host Device",
983
    .qdev.name      = "USB Host Device",
984
    .qdev.alias     = "usb-host",
983
    .qdev.name      = "usb-host",
985 984
    .qdev.size      = sizeof(USBHostDevice),
986 985
    .init           = usb_host_initfn,
987 986
    .handle_packet  = usb_host_handle_packet,
......
1011 1010
    USBHostDevice *s;
1012 1011
    char *p;
1013 1012

  
1014
    dev = usb_create(NULL /* FIXME */, "USB Host Device");
1013
    dev = usb_create(NULL /* FIXME */, "usb-host");
1015 1014
    s = DO_UPCAST(USBHostDevice, dev, dev);
1016 1015

  
1017 1016
    if (strstr(devname, "auto:")) {

Also available in: Unified diff