From nobody Wed Nov 5 18:32:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536922203938963.7607161321241; Fri, 14 Sep 2018 03:50:03 -0700 (PDT) Received: from localhost ([::1]:51007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g0lfm-0002V3-SU for importer@patchew.org; Fri, 14 Sep 2018 06:50:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g0leU-0001t5-F7 for qemu-devel@nongnu.org; Fri, 14 Sep 2018 06:48:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g0leR-00034M-8u for qemu-devel@nongnu.org; Fri, 14 Sep 2018 06:48:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g0leR-000346-1B for qemu-devel@nongnu.org; Fri, 14 Sep 2018 06:48:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67EBF99D39 for ; Fri, 14 Sep 2018 10:48:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-56.phx2.redhat.com [10.3.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 148475E7CE; Fri, 14 Sep 2018 10:48:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4DB1341A63; Fri, 14 Sep 2018 12:48:35 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 14 Sep 2018 12:48:35 +0200 Message-Id: <20180914104835.26019-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 14 Sep 2018 10:48:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] usb: assign unique serial numbers to hid devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Dr. David Alan Gilbert --- include/hw/compat.h | 14 +++++++++++++- hw/usb/dev-hid.c | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 6f4d5fc647..c059459394 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -2,7 +2,19 @@ #define HW_COMPAT_H =20 #define HW_COMPAT_3_0 \ - /* empty */ + {\ + .driver =3D "usb-kbd",\ + .property =3D "serial",\ + .value =3D "42",\ + },{\ + .driver =3D "usb-mouse",\ + .property =3D "serial",\ + .value =3D "42",\ + },{\ + .driver =3D "usb-tablet",\ + .property =3D "serial",\ + .value =3D "42",\ + }, =20 #define HW_COMPAT_2_12 \ {\ diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 62d18290dc..7ad6fb33a9 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -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 =3D { [STR_PRODUCT_MOUSE] =3D "QEMU USB Mouse", [STR_PRODUCT_TABLET] =3D "QEMU USB Tablet", [STR_PRODUCT_KEYBOARD] =3D "QEMU USB Keyboard", - [STR_SERIALNUMBER] =3D "42", /* =3D=3D remote wakeup works */ + [STR_SERIAL_MOUSE] =3D "89126", + [STR_SERIAL_TABLET] =3D "28754", + [STR_SERIAL_KEYBOARD] =3D "68284", [STR_CONFIG_MOUSE] =3D "HID Mouse", [STR_CONFIG_TABLET] =3D "HID Tablet", [STR_CONFIG_KEYBOARD] =3D "HID Keyboard", @@ -375,7 +379,7 @@ static const USBDesc desc_mouse =3D { .bcdDevice =3D 0, .iManufacturer =3D STR_MANUFACTURER, .iProduct =3D STR_PRODUCT_MOUSE, - .iSerialNumber =3D STR_SERIALNUMBER, + .iSerialNumber =3D STR_SERIAL_MOUSE, }, .full =3D &desc_device_mouse, .str =3D desc_strings, @@ -389,7 +393,7 @@ static const USBDesc desc_mouse2 =3D { .bcdDevice =3D 0, .iManufacturer =3D STR_MANUFACTURER, .iProduct =3D STR_PRODUCT_MOUSE, - .iSerialNumber =3D STR_SERIALNUMBER, + .iSerialNumber =3D STR_SERIAL_MOUSE, }, .full =3D &desc_device_mouse, .high =3D &desc_device_mouse2, @@ -404,7 +408,7 @@ static const USBDesc desc_tablet =3D { .bcdDevice =3D 0, .iManufacturer =3D STR_MANUFACTURER, .iProduct =3D STR_PRODUCT_TABLET, - .iSerialNumber =3D STR_SERIALNUMBER, + .iSerialNumber =3D STR_SERIAL_TABLET, }, .full =3D &desc_device_tablet, .str =3D desc_strings, @@ -418,7 +422,7 @@ static const USBDesc desc_tablet2 =3D { .bcdDevice =3D 0, .iManufacturer =3D STR_MANUFACTURER, .iProduct =3D STR_PRODUCT_TABLET, - .iSerialNumber =3D STR_SERIALNUMBER, + .iSerialNumber =3D STR_SERIAL_TABLET, }, .full =3D &desc_device_tablet, .high =3D &desc_device_tablet2, @@ -433,7 +437,7 @@ static const USBDesc desc_keyboard =3D { .bcdDevice =3D 0, .iManufacturer =3D STR_MANUFACTURER, .iProduct =3D STR_PRODUCT_KEYBOARD, - .iSerialNumber =3D STR_SERIALNUMBER, + .iSerialNumber =3D STR_SERIAL_TABLET, }, .full =3D &desc_device_keyboard, .str =3D desc_strings, @@ -447,7 +451,7 @@ static const USBDesc desc_keyboard2 =3D { .bcdDevice =3D 0, .iManufacturer =3D STR_MANUFACTURER, .iProduct =3D STR_PRODUCT_KEYBOARD, - .iSerialNumber =3D STR_SERIALNUMBER, + .iSerialNumber =3D STR_SERIAL_TABLET, }, .full =3D &desc_device_keyboard, .high =3D &desc_device_keyboard2, @@ -718,9 +722,7 @@ static void usb_hid_initfn(USBDevice *dev, int kind, return; } =20 - if (dev->serial) { - usb_desc_set_string(dev, STR_SERIALNUMBER, dev->serial); - } + usb_desc_create_serial(dev); usb_desc_init(dev); us->intr =3D usb_ep_get(dev, USB_TOKEN_IN, 1); hid_init(&us->hid, kind, usb_hid_changed); --=20 2.9.3