diff -Naur --no-dereference a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -73,8 +73,8 @@ }; static const USBDescStrings usb_audio_stringtable = { - [STRING_MANUFACTURER] = "QEMU", - [STRING_PRODUCT] = "QEMU USB Audio", + [STRING_MANUFACTURER] = "ASUS", + [STRING_PRODUCT] = "ASUS USB Audio", [STRING_SERIALNUMBER] = "1", [STRING_CONFIG] = "Audio Configuration", [STRING_USBAUDIO_CONTROL] = "Audio Device", @@ -1006,7 +1006,7 @@ dc->vmsd = &vmstate_usb_audio; device_class_set_props(dc, usb_audio_properties); set_bit(DEVICE_CATEGORY_SOUND, dc->categories); - k->product_desc = "QEMU USB Audio Interface"; + k->product_desc = "ASUS USB Audio Interface"; k->realize = usb_audio_realize; k->handle_reset = usb_audio_handle_reset; k->handle_control = usb_audio_handle_control; diff -Naur --no-dereference a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -63,10 +63,10 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", - [STR_PRODUCT_MOUSE] = "QEMU USB Mouse", - [STR_PRODUCT_TABLET] = "QEMU USB Tablet", - [STR_PRODUCT_KEYBOARD] = "QEMU USB Keyboard", + [STR_MANUFACTURER] = "ASUS", + [STR_PRODUCT_MOUSE] = "ASUS USB Mouse", + [STR_PRODUCT_TABLET] = "ASUS USB Tablet", + [STR_PRODUCT_KEYBOARD] = "ASUS USB Keyboard", [STR_SERIAL_COMPAT] = "42", [STR_CONFIG_MOUSE] = "HID Mouse", [STR_CONFIG_TABLET] = "HID Tablet", @@ -806,7 +806,7 @@ USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->realize = usb_tablet_realize; - uc->product_desc = "QEMU USB Tablet"; + uc->product_desc = "ASUS USB Tablet"; dc->vmsd = &vmstate_usb_ptr; device_class_set_props(dc, usb_tablet_properties); set_bit(DEVICE_CATEGORY_INPUT, dc->categories); @@ -829,7 +829,7 @@ USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->realize = usb_mouse_realize; - uc->product_desc = "QEMU USB Mouse"; + uc->product_desc = "ASUS USB Mouse"; dc->vmsd = &vmstate_usb_ptr; device_class_set_props(dc, usb_mouse_properties); set_bit(DEVICE_CATEGORY_INPUT, dc->categories); @@ -853,7 +853,7 @@ USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->realize = usb_keyboard_realize; - uc->product_desc = "QEMU USB Keyboard"; + uc->product_desc = "ASUS USB Keyboard"; dc->vmsd = &vmstate_usb_kbd; device_class_set_props(dc, usb_keyboard_properties); set_bit(DEVICE_CATEGORY_INPUT, dc->categories); diff -Naur --no-dereference a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -104,9 +104,9 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", - [STR_PRODUCT] = "QEMU USB Hub", - [STR_SERIALNUMBER] = "314159", + [STR_MANUFACTURER] = "ASUS", + [STR_PRODUCT] = "ASUS USB Hub", + [STR_SERIALNUMBER] = "114514", }; static const USBDescIface desc_iface_hub = { @@ -676,7 +676,7 @@ USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->realize = usb_hub_realize; - uc->product_desc = "QEMU USB Hub"; + uc->product_desc = "ASUS USB Hub"; uc->usb_desc = &desc_hub; uc->find_device = usb_hub_find_device; uc->handle_reset = usb_hub_handle_reset; diff -Naur --no-dereference a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -247,8 +247,8 @@ /* ----------------------------------------------------------------------- */ -#define MTP_MANUFACTURER "QEMU" -#define MTP_PRODUCT "QEMU filesharing" +#define MTP_MANUFACTURER "ASUS" +#define MTP_PRODUCT "ASUS filesharing" #define MTP_WRITE_BUF_SZ (512 * KiB) enum { @@ -2091,7 +2091,7 @@ USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->realize = usb_mtp_realize; - uc->product_desc = "QEMU USB MTP"; + uc->product_desc = "ASUS USB MTP"; uc->usb_desc = &desc; uc->cancel_packet = usb_mtp_cancel_packet; uc->handle_attach = usb_desc_attach; diff -Naur --no-dereference a/hw/usb/dev-network.c b/hw/usb/dev-network.c --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -99,15 +99,15 @@ #define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ static const USBDescStrings usb_net_stringtable = { - [STRING_MANUFACTURER] = "QEMU", - [STRING_PRODUCT] = "RNDIS/QEMU USB Network Device", - [STRING_ETHADDR] = "400102030405", - [STRING_DATA] = "QEMU USB Net Data Interface", - [STRING_CONTROL] = "QEMU USB Net Control Interface", - [STRING_RNDIS_CONTROL] = "QEMU USB Net RNDIS Control Interface", - [STRING_CDC] = "QEMU USB Net CDC", - [STRING_SUBSET] = "QEMU USB Net Subset", - [STRING_RNDIS] = "QEMU USB Net RNDIS", + [STRING_MANUFACTURER] = "ASUS", + [STRING_PRODUCT] = "RNDIS/ASUS USB Network Device", + [STRING_ETHADDR] = "400114514405", + [STRING_DATA] = "ASUS USB Net Data Interface", + [STRING_CONTROL] = "ASUS USB Net Control Interface", + [STRING_RNDIS_CONTROL] = "ASUS USB Net RNDIS Control Interface", + [STRING_CDC] = "ASUS USB Net CDC", + [STRING_SUBSET] = "ASUS USB Net Subset", + [STRING_RNDIS] = "ASUS USB Net RNDIS", [STRING_SERIALNUMBER] = "1", }; @@ -725,7 +725,7 @@ /* mandatory */ case OID_GEN_VENDOR_DESCRIPTION: - pstrcpy((char *)outbuf, outlen, "QEMU USB RNDIS Net"); + pstrcpy((char *)outbuf, outlen, "ASUS USB RNDIS Net"); return strlen((char *)outbuf) + 1; case OID_GEN_VENDOR_DRIVER_VERSION: @@ -1379,7 +1379,7 @@ s->speed = 1000000; /* 100MBps, in 100Bps units */ s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */; s->filter = 0; - s->vendorid = 0x1234; + s->vendorid = 0x8086; s->connection = 1; /* Connected */ s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1); s->bulk_in = usb_ep_get(dev, USB_TOKEN_IN, 2); @@ -1426,7 +1426,7 @@ USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->realize = usb_net_realize; - uc->product_desc = "QEMU USB Network Interface"; + uc->product_desc = "ASUS USB Network Interface"; uc->usb_desc = &desc_net; uc->handle_reset = usb_net_handle_reset; uc->handle_control = usb_net_handle_control; diff -Naur --no-dereference a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -119,9 +119,9 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", - [STR_PRODUCT_SERIAL] = "QEMU USB SERIAL", - [STR_PRODUCT_BRAILLE] = "QEMU USB BAUM BRAILLE", + [STR_MANUFACTURER] = "ASUS", + [STR_PRODUCT_SERIAL] = "ASUS USB SERIAL", + [STR_PRODUCT_BRAILLE] = "ASUS USB BAUM BRAILLE", [STR_SERIALNUMBER] = "1", }; @@ -666,7 +666,7 @@ DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->product_desc = "QEMU USB Serial"; + uc->product_desc = "ASUS USB Serial"; uc->usb_desc = &desc_serial; device_class_set_props(dc, serial_properties); } @@ -687,7 +687,7 @@ DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->product_desc = "QEMU USB Braille"; + uc->product_desc = "ASUS USB Braille"; uc->usb_desc = &desc_braille; device_class_set_props(dc, braille_properties); } diff -Naur --no-dereference a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -80,8 +80,8 @@ #define CCID_CONTROL_GET_CLOCK_FREQUENCIES 0x2 #define CCID_CONTROL_GET_DATA_RATES 0x3 -#define CCID_PRODUCT_DESCRIPTION "QEMU USB CCID" -#define CCID_VENDOR_DESCRIPTION "QEMU" +#define CCID_PRODUCT_DESCRIPTION "ASUS USB CCID" +#define CCID_VENDOR_DESCRIPTION "ASUS" #define CCID_INTERFACE_NAME "CCID Interface" #define CCID_SERIAL_NUMBER_STRING "1" /* @@ -419,8 +419,8 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", - [STR_PRODUCT] = "QEMU USB CCID", + [STR_MANUFACTURER] = "ASUS", + [STR_PRODUCT] = "ASUS USB CCID", [STR_SERIALNUMBER] = "1", [STR_INTERFACE] = "CCID Interface", }; @@ -1443,7 +1443,7 @@ HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); uc->realize = ccid_realize; - uc->product_desc = "QEMU USB CCID"; + uc->product_desc = "ASUS USB CCID"; uc->usb_desc = &desc_ccid; uc->handle_reset = ccid_handle_reset; uc->handle_control = ccid_handle_control; diff -Naur --no-dereference a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -47,8 +47,8 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", - [STR_PRODUCT] = "QEMU USB HARDDRIVE", + [STR_MANUFACTURER] = "ASUS", + [STR_PRODUCT] = "ASUS USB HARDDRIVE", [STR_SERIALNUMBER] = "1", [STR_CONFIG_FULL] = "Full speed config (usb 1.1)", [STR_CONFIG_HIGH] = "High speed config (usb 2.0)", @@ -591,7 +591,7 @@ DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->product_desc = "QEMU USB MSD"; + uc->product_desc = "ASUS USB MSD"; uc->usb_desc = &desc; uc->cancel_packet = usb_msd_cancel_io; uc->handle_attach = usb_desc_attach; diff -Naur --no-dereference a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -171,9 +171,9 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", + [STR_MANUFACTURER] = "ASUS", [STR_PRODUCT] = "USB Attached SCSI HBA", - [STR_SERIALNUMBER] = "27842", + [STR_SERIALNUMBER] = "33121", [STR_CONFIG_HIGH] = "High speed config (usb 2.0)", [STR_CONFIG_SUPER] = "Super speed config (usb 3.0)", }; diff -Naur --no-dereference a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -64,7 +64,7 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", + [STR_MANUFACTURER] = "ASUS", [STR_PRODUCT] = "Wacom PenPartner", [STR_SERIALNUMBER] = "1", }; @@ -231,7 +231,7 @@ if (!s->mouse_grabbed) { s->eh_entry = qemu_add_mouse_event_handler(usb_mouse_event, s, 0, - "QEMU PenPartner tablet"); + "ASUS PenPartner tablet"); qemu_activate_mouse_event_handler(s->eh_entry); s->mouse_grabbed = 1; } @@ -269,7 +269,7 @@ if (!s->mouse_grabbed) { s->eh_entry = qemu_add_mouse_event_handler(usb_wacom_event, s, 1, - "QEMU PenPartner tablet"); + "ASUS PenPartner tablet"); qemu_activate_mouse_event_handler(s->eh_entry); s->mouse_grabbed = 1; } @@ -425,7 +425,7 @@ DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->product_desc = "QEMU PenPartner Tablet"; + uc->product_desc = "ASUS PenPartner Tablet"; uc->usb_desc = &desc_wacom; uc->realize = usb_wacom_realize; uc->handle_reset = usb_wacom_handle_reset; @@ -433,7 +433,7 @@ uc->handle_data = usb_wacom_handle_data; uc->unrealize = usb_wacom_unrealize; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); - dc->desc = "QEMU PenPartner Tablet"; + dc->desc = "ASUS PenPartner Tablet"; dc->vmsd = &vmstate_usb_wacom; } diff -Naur --no-dereference a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c --- a/hw/usb/u2f-emulated.c +++ b/hw/usb/u2f-emulated.c @@ -386,7 +386,7 @@ kc->realize = u2f_emulated_realize; kc->unrealize = u2f_emulated_unrealize; kc->recv_from_guest = u2f_emulated_recv_from_guest; - dc->desc = "QEMU U2F emulated key"; + dc->desc = "ASUS U2F emulated key"; device_class_set_props(dc, u2f_emulated_properties); } diff -Naur --no-dereference a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -531,7 +531,7 @@ kc->realize = u2f_passthru_realize; kc->unrealize = u2f_passthru_unrealize; kc->recv_from_guest = u2f_passthru_recv_from_guest; - dc->desc = "QEMU U2F passthrough key"; + dc->desc = "ASUS U2F passthrough key"; dc->vmsd = &u2f_passthru_vmstate; device_class_set_props(dc, u2f_passthru_properties); set_bit(DEVICE_CATEGORY_MISC, dc->categories); diff -Naur --no-dereference a/hw/usb/u2f.c b/hw/usb/u2f.c --- a/hw/usb/u2f.c +++ b/hw/usb/u2f.c @@ -46,7 +46,7 @@ }; static const USBDescStrings desc_strings = { - [STR_MANUFACTURER] = "QEMU", + [STR_MANUFACTURER] = "ASUS", [STR_PRODUCT] = "U2F USB key", [STR_SERIALNUMBER] = "0", [STR_CONFIG] = "U2F key config", @@ -322,7 +322,7 @@ DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->product_desc = "QEMU U2F USB key"; + uc->product_desc = "ASUS U2F USB key"; uc->usb_desc = &desc_u2f_key; uc->handle_reset = u2f_key_handle_reset; uc->handle_control = u2f_key_handle_control; @@ -330,7 +330,7 @@ uc->handle_attach = usb_desc_attach; uc->realize = u2f_key_realize; uc->unrealize = u2f_key_unrealize; - dc->desc = "QEMU U2F key"; + dc->desc = "ASUS U2F key"; dc->vmsd = &vmstate_u2f_key; }