From nobody Wed Oct 29 20:45:15 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151056284740884.70657917100948; Mon, 13 Nov 2017 00:47:27 -0800 (PST) Received: from localhost ([::1]:53176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEAOa-0003J5-ES for importer@patchew.org; Mon, 13 Nov 2017 03:47:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEANf-0002pO-0p for qemu-devel@nongnu.org; Mon, 13 Nov 2017 03:46:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEANb-0001Bz-2l for qemu-devel@nongnu.org; Mon, 13 Nov 2017 03:46:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53066) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eEANa-0001BQ-TL for qemu-devel@nongnu.org; Mon, 13 Nov 2017 03:46:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2F1556A7DF for ; Mon, 13 Nov 2017 08:46:05 +0000 (UTC) Received: from dhcp-1-107.brq.redhat.com (unknown [10.43.2.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9567D5FFE5; Mon, 13 Nov 2017 08:45:59 +0000 (UTC) From: Ladi Prosek To: qemu-devel@nongnu.org Date: Mon, 13 Nov 2017 09:45:58 +0100 Message-Id: <20171113084558.28369-1-lprosek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 13 Nov 2017 08:46:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] virtio-pci: Don't force Subsystem Vendor ID = Vendor ID 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: yvugenfi@redhat.com, kraxel@redhat.com, vrozenfe@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The statement being removed doesn't change anything as virtio PCI devices a= lready have Subsystem Vendor ID set to pci_default_sub_vendor_id (0x1af4), same as= Vendor ID. And the Virtio spec does not require the two to be equal, either: "The PCI Subsystem Vendor ID and the PCI Subsystem Device ID MAY reflect = the PCI Vendor and Device ID of the environment (for informational purposes by th= e driver)." Background: Following the recent virtio-win licensing change, several vendors are plann= ing to ship their own certified version of Windows guest Virtio drivers, potential= ly taking advantage of Windows Update as a distribution channel. It is therefore crit= ical that each vendor uses their own PCI Subsystem Vendor ID for Virtio devices to pr= event drivers from other vendors binding to it. This would be trivially done by adding: k->subsystem_vendor_id =3D ... to virtio_pci_class_init(). Except for the problematic statement deleted by= this patch, which reverts the Subsystem Vendor ID back to 0x1af4 for legacy devi= ces for no good reason. Signed-off-by: Ladi Prosek Reviewed-by: Gerd Hoffmann --- v1->v2: * Added a comment about the default Subsystem Vendor ID. hw/virtio/virtio-pci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index e92837c42b..148621d9c7 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1588,9 +1588,11 @@ static void virtio_pci_device_plugged(DeviceState *d= , Error **errp) "neither legacy nor transitional device."); return ; } - /* legacy and transitional */ - pci_set_word(config + PCI_SUBSYSTEM_VENDOR_ID, - pci_get_word(config + PCI_VENDOR_ID)); + /* + * Legacy and transitional devices use specific subsystem IDs. + * Note that the subsystem vendor ID (config + PCI_SUBSYSTEM_VENDO= R_ID) + * is set to PCI_SUBVENDOR_ID_REDHAT_QUMRANET by default. + */ pci_set_word(config + PCI_SUBSYSTEM_ID, virtio_bus_get_vdev_id(bus= )); } else { /* pure virtio-1.0 */ --=20 2.13.5