Revision 06384698

b/hw/usb-bt.c
645 645
}
646 646

  
647 647
static struct USBDeviceInfo bt_info = {
648
    .product_desc   = "QEMU BT dongle",
648 649
    .qdev.name      = "QEMU BT dongle",
649 650
    .qdev.size      = sizeof(struct USBBtState),
650 651
    .init           = usb_bt_initfn,
b/hw/usb-bus.c
43 43
    USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, base);
44 44
    int rc;
45 45

  
46
    pstrcpy(dev->product_desc, sizeof(dev->product_desc), qdev->info->name);
46
    pstrcpy(dev->product_desc, sizeof(dev->product_desc), info->product_desc);
47 47
    dev->info = info;
48 48
    dev->auto_attach = 1;
49 49
    rc = dev->info->init(dev);
b/hw/usb-hid.c
880 880

  
881 881
static struct USBDeviceInfo hid_info[] = {
882 882
    {
883
        .product_desc   = "QEMU USB Tablet",
883 884
        .qdev.name      = "QEMU USB Tablet",
884 885
        .qdev.alias     = "usb-tablet",
885 886
        .usbdevice_name = "tablet",
......
891 892
        .handle_data    = usb_hid_handle_data,
892 893
        .handle_destroy = usb_hid_handle_destroy,
893 894
    },{
895
        .product_desc   = "QEMU USB Mouse",
894 896
        .qdev.name      = "QEMU USB Mouse",
895 897
        .qdev.alias     = "usb-mouse",
896 898
        .usbdevice_name = "mouse",
......
902 904
        .handle_data    = usb_hid_handle_data,
903 905
        .handle_destroy = usb_hid_handle_destroy,
904 906
    },{
907
        .product_desc   = "QEMU USB Keyboard",
905 908
        .qdev.name      = "QEMU USB Keyboard",
906 909
        .qdev.alias     = "usb-kbd",
907 910
        .usbdevice_name = "keyboard",
b/hw/usb-hub.c
544 544
}
545 545

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

  
602 602
static struct USBDeviceInfo msd_info = {
603
    .product_desc   = "QEMU USB MSD",
603 604
    .qdev.name      = "QEMU USB MSD",
604 605
    .qdev.alias     = "usb-storage",
605 606
    .qdev.size      = sizeof(MSDState),
b/hw/usb-net.c
1487 1487
}
1488 1488

  
1489 1489
static struct USBDeviceInfo net_info = {
1490
    .product_desc   = "QEMU USB Network Interface",
1490 1491
    .qdev.name      = "QEMU USB Network Interface",
1491 1492
    .qdev.size      = sizeof(USBNetState),
1492 1493
    .init           = usb_net_initfn,
b/hw/usb-serial.c
605 605
}
606 606

  
607 607
static struct USBDeviceInfo serial_info = {
608
    .product_desc   = "QEMU USB Serial",
608 609
    .qdev.name      = "QEMU USB Serial",
609 610
    .qdev.alias     = "usb-serial",
610 611
    .qdev.size      = sizeof(USBSerialState),
......
625 626
};
626 627

  
627 628
static struct USBDeviceInfo braille_info = {
629
    .product_desc   = "QEMU USB Braille",
628 630
    .qdev.name      = "QEMU USB Braille",
629 631
    .qdev.alias     = "usb-braille",
630 632
    .qdev.size      = sizeof(USBSerialState),
b/hw/usb-wacom.c
409 409
}
410 410

  
411 411
static struct USBDeviceInfo wacom_info = {
412
    .product_desc   = "QEMU PenPartner Tablet",
412 413
    .qdev.name      = "QEMU PenPartner Tablet",
413 414
    .qdev.alias     = "wacom-tablet",
414 415
    .usbdevice_name = "wacom-tablet",
b/hw/usb.h
185 185
     */
186 186
    int (*handle_data)(USBDevice *dev, USBPacket *p);
187 187

  
188
    const char *product_desc;
189

  
188 190
    /* handle legacy -usbdevice command line options */
189 191
    const char *usbdevice_name;
190 192
    USBDevice *(*usbdevice_init)(const char *params);
b/usb-bsd.c
393 393
}
394 394

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

  
981 981
static struct USBDeviceInfo usb_host_dev_info = {
982
    .product_desc   = "USB Host Device",
982 983
    .qdev.name      = "USB Host Device",
983 984
    .qdev.alias     = "usb-host",
984 985
    .qdev.size      = sizeof(USBHostDevice),

Also available in: Unified diff