usb: assign unique serial numbers to hid devices
PATCH v2 1/1 usb: assign unique serial numbers to hid devices
Windows guests have trouble dealing with usb devices having identical serial numbers. So, assign unique serial numbers to usb hid devices. All other usb devices have this already.
--- include/hw/compat.h | 14 +++++++++++++- hw/usb/dev-hid.c | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-)
include/hw/compat.h +13 -1
@@ -2,7 +2,19 @@#define HW_COMPAT_H #define HW_COMPAT_3_0 \ -/* empty */ + {\ + .driver = "usb-kbd",\ + .property = "serial",\ + .value = "42",\ + },{\ + .driver = "usb-mouse",\ + .property = "serial",\ + .value = "42",\ + },{\ + .driver = "usb-tablet",\ + .property = "serial",\ + .value = "42",\ + },#define HW_COMPAT_2_12 \ {\
hw/usb/dev-hid.c +13 -11
@@ -61,7 +61,9 @@ enum {STR_PRODUCT_MOUSE ,STR_PRODUCT_TABLET ,STR_PRODUCT_KEYBOARD , -STR_SERIALNUMBER , +STR_SERIAL_MOUSE , +STR_SERIAL_TABLET , +STR_SERIAL_KEYBOARD ,STR_CONFIG_MOUSE ,STR_CONFIG_TABLET , STR_CONFIG_KEYBOARD,
@@ -72,7 +74,9 @@ static const USBDescStrings desc_strings = { [STR_PRODUCT_MOUSE] = "QEMU USB Mouse", [STR_PRODUCT_TABLET] = "QEMU USB Tablet", [STR_PRODUCT_KEYBOARD] = "QEMU USB Keyboard", - [STR_SERIALNUMBER] = "42", /* == remote wakeup works */ + [STR_SERIAL_MOUSE] = "89126", + [STR_SERIAL_TABLET] = "28754", + [STR_SERIAL_KEYBOARD] = "68284", [STR_CONFIG_MOUSE] = "HID Mouse", [STR_CONFIG_TABLET] = "HID Tablet", [STR_CONFIG_KEYBOARD] = "HID Keyboard",
@@ -375,7 +379,7 @@ static const USBDesc desc_mouse = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_MOUSE, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_MOUSE, }, .full = &desc_device_mouse, .str = desc_strings,
@@ -389,7 +393,7 @@ static const USBDesc desc_mouse2 = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_MOUSE, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_MOUSE, }, .full = &desc_device_mouse, .high = &desc_device_mouse2,
@@ -404,7 +408,7 @@ static const USBDesc desc_tablet = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_TABLET, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_tablet, .str = desc_strings,
@@ -418,7 +422,7 @@ static const USBDesc desc_tablet2 = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_TABLET, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_tablet, .high = &desc_device_tablet2,
@@ -433,7 +437,7 @@ static const USBDesc desc_keyboard = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_KEYBOARD, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_keyboard, .str = desc_strings,
@@ -447,7 +451,7 @@ static const USBDesc desc_keyboard2 = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_KEYBOARD, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_keyboard, .high = &desc_device_keyboard2,
@@ -718,9 +722,7 @@ static void usb_hid_initfn(USBDevice *dev, int kind,return ; } -if (dev->serial) { -usb_desc_set_string (dev,STR_SERIALNUMBER , dev->serial); - } +usb_desc_create_serial (dev);usb_desc_init (dev); us->intr =usb_ep_get (dev,USB_TOKEN_IN ,1 );hid_init (&us->hid, kind, usb_hid_changed);
Signature · 1 line
2.9.3
Quoted 50 lines · * Gerd Hoffmann ([email protected]) wrote:
Windows guests have trouble dealing with usb devices having identical serial numbers. So, assign unique serial numbers to usb hid devices. All other usb devices have this already.
Signed-off-by Gerd Hoffmann <[email protected]>--- include/hw/compat.h | 14 +++++++++++++- hw/usb/dev-hid.c | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-)include/hw/compat.h +13
-1@@ -2,7 +2,19 @@#define HW_COMPAT_H #define HW_COMPAT_3_0 \ -/* empty */ + {\ + .driver = "usb-kbd",\ + .property = "serial",\ + .value = "42",\ + },{\ + .driver = "usb-mouse",\ + .property = "serial",\ + .value = "42",\ + },{\ + .driver = "usb-tablet",\ + .property = "serial",\ + .value = "42",\ + },#define HW_COMPAT_2_12 \ {\hw/usb/dev-hid.c +3
-1@@ -61,7 +61,9 @@ enum {STR_PRODUCT_MOUSE ,STR_PRODUCT_TABLET ,STR_PRODUCT_KEYBOARD , -STR_SERIALNUMBER , +STR_SERIAL_MOUSE , +STR_SERIAL_TABLET , +STR_SERIAL_KEYBOARD ,STR_CONFIG_MOUSE ,STR_CONFIG_TABLET , STR_CONFIG_KEYBOARD,
hw/usb/dev-hid.c static const USBDescStrings desc_strings = { · line 79
Quoted 7 lines
hw/usb/dev-hid.c +3
-1@@ -72,7 +74,9 @@ static const USBDescStrings desc_strings = { [STR_PRODUCT_MOUSE] = "QEMU USB Mouse", [STR_PRODUCT_TABLET] = "QEMU USB Tablet", [STR_PRODUCT_KEYBOARD] = "QEMU USB Keyboard", - [STR_SERIALNUMBER] = "42", /* == remote wakeup works */ + [STR_SERIAL_MOUSE] = "89126", + [STR_SERIAL_TABLET] = "28754", + [STR_SERIAL_KEYBOARD] = "68284",
OK, so now I've found the bit about the magic 42; commit 7b074a22 of yours; recommended checking for 42 for knowing we had autosuspend; what's actually in the current fedora hid rules is serial!=1 - I wonder what others have.
It's a shame these are random numbers rather than 2,3,4; but still.
Quoted 58 lines
hw/usb/dev-hid.c +6
-6[STR_CONFIG_MOUSE] = "HID Mouse", [STR_CONFIG_TABLET] = "HID Tablet", [STR_CONFIG_KEYBOARD] = "HID Keyboard",@@ -375,7 +379,7 @@ static const USBDesc desc_mouse = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_MOUSE, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_MOUSE, }, .full = &desc_device_mouse, .str = desc_strings,@@ -389,7 +393,7 @@ static const USBDesc desc_mouse2 = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_MOUSE, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_MOUSE, }, .full = &desc_device_mouse, .high = &desc_device_mouse2,@@ -404,7 +408,7 @@ static const USBDesc desc_tablet = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_TABLET, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_tablet, .str = desc_strings,@@ -418,7 +422,7 @@ static const USBDesc desc_tablet2 = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_TABLET, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_tablet, .high = &desc_device_tablet2,@@ -433,7 +437,7 @@ static const USBDesc desc_keyboard = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_KEYBOARD, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_keyboard, .str = desc_strings,@@ -447,7 +451,7 @@ static const USBDesc desc_keyboard2 = { .bcdDevice = 0, .iManufacturer = STR_MANUFACTURER, .iProduct = STR_PRODUCT_KEYBOARD, - .iSerialNumber = STR_SERIALNUMBER, + .iSerialNumber = STR_SERIAL_TABLET, }, .full = &desc_device_keyboard, .high = &desc_device_keyboard2,
hw/usb/dev-hid.c static void usb_hid_initfn(USBDevice *dev, int kind, · line 725
Quoted 7 lines
hw/usb/dev-hid.c +1
-3@@ -718,9 +722,7 @@ static void usb_hid_initfn(USBDevice *dev, int kind,return ; } -if (dev->serial) { -usb_desc_set_string (dev,STR_SERIALNUMBER , dev->serial); - } +usb_desc_create_serial (dev);
In the cases where I've not passed serial= on the command line, who wins, does this mean create_serial uses the path or does it use the magic constants you set above?
Dave
Quoted 6 lines
hw/usb/dev-hid.c +0
-0usb_desc_init (dev); us->intr =usb_ep_get (dev,USB_TOKEN_IN ,1 );hid_init (&us->hid, kind, usb_hid_changed);Signature · 1 line
2.9.3
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Hi,
Quoted 4 lines
OK, so now I've found the bit about the magic 42; commit
7b074a22of yours; recommended checking for 42 for knowing we had autosuspend; what's actually in the current fedora hid rules is serial!=1 - I wonder what others have.
Whatever upstream systemd/udev has I guess ...
A bit of history ...
* First there was nothing.
* Then I added a rule to udev checking for serial == 42 (this is in rhel-6).
* Then systemd + udev merged.
* Then I changed the rule to check for serial != 1 instead, so we can use any serial but "1" which is the one the old broken devices had (this is in rhel-7). March 2014 in upstream systemd.
* Then all usb power management rules where dropped from systemd (June 2015). Which I figured today, after wondering that the rules are gone in fedora 28.
So, three years ago the serial number check was dropped upstream, yet I hav't seen a single report about autosuspend issues (or cpu usage for usb emulation going up, which is the typical symtom).
So I figured I can stop worring that changing the serial number will break things and just do it.
And even if it turns out autosuspend is still an issue: I think meanwhile we can really stop worrying about guests running in old qemu versions with broken usb suspend (fixed in 0.13 !). If needed we can enable autosuspend unconditionally in guests.
cheers,
Gerd
Quoted 26 lines · * Gerd Hoffmann ([email protected]) wrote:
Hi,
Quoted 4 lines
OK, so now I've found the bit about the magic 42; commit
7b074a22of yours; recommended checking for 42 for knowing we had autosuspend; what's actually in the current fedora hid rules is serial!=1 - I wonder what others have.Whatever upstream systemd/udev has I guess ...
A bit of history ...
* First there was nothing.
* Then I added a rule to udev checking for serial == 42 (this is in rhel-6).
* Then systemd + udev merged.
* Then I changed the rule to check for serial != 1 instead, so we can use any serial but "1" which is the one the old broken devices had (this is in rhel-7). March 2014 in upstream systemd.
* Then all usb power management rules where dropped from systemd (June 2015). Which I figured today, after wondering that the rules are gone in fedora 28.So, three years ago the serial number check was dropped upstream, yet I hav't seen a single report about autosuspend issues (or cpu usage for usb emulation going up, which is the typical symtom).
Quoted 7 lines
So I figured I can stop worring that changing the serial number will break things and just do it.
And even if it turns out autosuspend is still an issue: I think meanwhile we can really stop worrying about guests running in old qemu versions with broken usb suspend (fixed in 0.13 !). If needed we can enable autosuspend unconditionally in guests.
OK, so what about the other question - which serial number do we end up with after this patch; do we get the 89126/28754/68284 or do we get the path based one from your change that calls usb_desc_create_serial?
Dave
Quoted 3 lines
cheers,
Gerd
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK