qdev: Rename USBDevice member devname to product_desc

[qemu.git] / hw / usb.h

diff --git a/hw/usb.h b/hw/usb.h
index 62362a7da192ca02923f1e0efa7ae757f0920e12..39aba995f81b672e790b2cdcfd30fbab93b50baf 100644 (file)
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -132,7 +132,8 @@ struct USBDevice {
 
     int speed;
     uint8_t addr;
-    char devname[32];
+    char product_desc[32];
+    int auto_attach;
     int attached;
 
     int state;
@@ -255,19 +256,12 @@ void usb_host_info(Monitor *mon);
 /* usb-hid.c */
 void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *));
 
-/* usb-msd.c */
-USBDevice *usb_msd_init(const char *filename);
-BlockDriverState *usb_msd_get_bdrv(USBDevice *dev);
-
 /* usb-net.c */
 USBDevice *usb_net_init(NICInfo *nd);
 
 /* usb-bt.c */
 USBDevice *usb_bt_init(HCIInfo *hci);
 
-/* usb-serial.c */
-USBDevice *usb_serial_init(const char *filename);
-
 /* usb ports of the VM */
 
 #define VM_USB_HUB_SIZE 8