From nobody Tue Apr 30 14:59:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664547321; cv=none; d=zohomail.com; s=zohoarc; b=GDUWRgTEyXTFR1DBbUiBxe5xL4bzdGq/fIKmVCIjmiXOQu1PeNvngiujo500Gi1g1GRCz4FaBrLK+w3hOUslcJEqO3YNIKmbSRo41wdM0ogaMsFByKw+zSF5JxW8V8BzNR8H+rk6CABXd92tPiFwweJMJjth+RuKLercLYFDsBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664547321; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PyLTx33J7iDobBcgzX/Ijz+Tit99LJFndHY2+aw7ORA=; b=JKpCkB3PVCIEw+IuC6PSKbFhIaRPyyjXrshUoD6a+5d9rjPkY4pPKAlw765IKf3xlzcNlTKuHLL1Fmacej+bM/QbhhyVbB/PWhbrTcgnS+wePzYYHJDbPUqr/VrhFLq29ig8CJNX8rYckvnTs66fUy5CqLyqZzV7MJ4nLV3UotM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664547321213915.5254259172202; Fri, 30 Sep 2022 07:15:21 -0700 (PDT) Received: from localhost ([::1]:54444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeGnP-0001rd-SY for importer@patchew.org; Fri, 30 Sep 2022 10:15:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGX3-00049t-6X for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGWt-0002Nr-KT for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:24 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-492-kcUA3vc9MhyrcQ3Qot-FyQ-1; Fri, 30 Sep 2022 09:58:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8384E862FDF; Fri, 30 Sep 2022 13:58:12 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EEC039D6A; Fri, 30 Sep 2022 13:58:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EAB0318003B3; Fri, 30 Sep 2022 15:58:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664546294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PyLTx33J7iDobBcgzX/Ijz+Tit99LJFndHY2+aw7ORA=; b=RP5V0xxF1ImChMcxk7kuemtDSD18YdzzbmL5L3NvLmUsqm8a/+46z9Y5RKXnJGl26USmcP T1HjkD0Q9zkRcOtkkG76P64LuQyVXtgP7O1IWbYtxy6shJ7lFw7F8vJdZJ45izaJ3AshHz k+Shx0AY/fSk3npTRoicBFjBIlNt3bU= X-MC-Unique: kcUA3vc9MhyrcQ3Qot-FyQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Eric Auger , David Hildenbrand , peter.maydell@linaro.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann Subject: [PATCH v2 1/5] pci-ids: drop PCI_DEVICE_ID_VIRTIO_IOMMU Date: Fri, 30 Sep 2022 15:58:06 +0200 Message-Id: <20220930135810.1892149-2-kraxel@redhat.com> In-Reply-To: <20220930135810.1892149-1-kraxel@redhat.com> References: <20220930135810.1892149-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664547322643100001 Content-Type: text/plain; charset="utf-8" Not needed for a virtio 1.0 device. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Auger Tested-by: Eric Auger --- include/hw/pci/pci.h | 1 - hw/virtio/virtio-iommu-pci.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index b54b6ef88fc3..89eaca429389 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -85,7 +85,6 @@ extern bool pci_available; #define PCI_DEVICE_ID_VIRTIO_9P 0x1009 #define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 #define PCI_DEVICE_ID_VIRTIO_PMEM 0x1013 -#define PCI_DEVICE_ID_VIRTIO_IOMMU 0x1014 #define PCI_DEVICE_ID_VIRTIO_MEM 0x1015 =20 #define PCI_VENDOR_ID_REDHAT 0x1b36 diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index 844d64770406..79ea8334f04e 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -74,8 +74,6 @@ static void virtio_iommu_pci_class_init(ObjectClass *klas= s, void *data) k->realize =3D virtio_iommu_pci_realize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); device_class_set_props(dc, virtio_iommu_pci_properties); - pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_IOMMU; pcidev_k->revision =3D VIRTIO_PCI_ABI_VERSION; pcidev_k->class_id =3D PCI_CLASS_OTHERS; dc->hotpluggable =3D false; @@ -90,7 +88,7 @@ static void virtio_iommu_pci_instance_init(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_IOMMU_PCI, + .generic_name =3D TYPE_VIRTIO_IOMMU_PCI, .instance_size =3D sizeof(VirtIOIOMMUPCI), .instance_init =3D virtio_iommu_pci_instance_init, .class_init =3D virtio_iommu_pci_class_init, --=20 2.37.3 From nobody Tue Apr 30 14:59:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664547074; cv=none; d=zohomail.com; s=zohoarc; b=JHOcEgOUtVlRvvwa/YFc315w6xzFEF/qFVk/l3SclaLkg9YEkgiv5YhYTZL61GHzFF2FgMu+7nIHoM/Sbx98qABGBUej7X5nhWyPPghdtsV53Myp98fNdo3OeXNdWAxtherC+j3iVm6wClkvSwHWqBKuUUA0yEdSpt/fIrd3iYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664547074; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YAOWOYAkUhK/QP/VV7lj9NTyORsv00ETgmTef3ZFJGE=; b=XJHmooK8IVK6jv8hvRDnf1Td9/BPKGpxtv03XWrZs4LjxTgB4JSmV/2CUv5r6zoTFegLaKtslwTf41ihTltnh1dKO1UI+GHku6UvbxCfIaGHDcrXH3TDrpqr0NFr+LlrKWqT/tx7cb4MEclRw16QzNPbirXNt+cH5Dd7XNkCZO8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664547074058840.7301084173231; Fri, 30 Sep 2022 07:11:14 -0700 (PDT) Received: from localhost ([::1]:50008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeGjQ-00044Q-Ob for importer@patchew.org; Fri, 30 Sep 2022 10:11:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGX2-000453-N5 for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGWx-0002OV-QJ for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:21 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-cFEwpMCAPp2TaYufSn-SGQ-1; Fri, 30 Sep 2022 09:58:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EA37338012D5; Fri, 30 Sep 2022 13:58:13 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DA8D2166B26; Fri, 30 Sep 2022 13:58:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 06032180061C; Fri, 30 Sep 2022 15:58:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664546299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YAOWOYAkUhK/QP/VV7lj9NTyORsv00ETgmTef3ZFJGE=; b=Ik5JwE5M8QuayrJ0ZCMx7rutg/uVM/EI7nl0Q7zPnwoAbiH4tUI4Yv9vP0F6Ve/NAchfOe 6f6QpCT0/HxcMsZU5qWPlzxxoSqciIuXI+mA5ujApCf3uK18iZJk8AOrGv0Wz8/NHaylwt 7SlZBmYVWdYCVsplqDRD2zg8hkHRn+4= X-MC-Unique: cFEwpMCAPp2TaYufSn-SGQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Eric Auger , David Hildenbrand , peter.maydell@linaro.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann Subject: [PATCH v2 2/5] pci-ids: drop PCI_DEVICE_ID_VIRTIO_MEM Date: Fri, 30 Sep 2022 15:58:07 +0200 Message-Id: <20220930135810.1892149-3-kraxel@redhat.com> In-Reply-To: <20220930135810.1892149-1-kraxel@redhat.com> References: <20220930135810.1892149-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664547075200100001 Content-Type: text/plain; charset="utf-8" Not needed for a virtio 1.0 device. Signed-off-by: Gerd Hoffmann Reviewed-by: David Hildenbrand --- include/hw/pci/pci.h | 1 - hw/virtio/virtio-mem-pci.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 89eaca429389..b6aefb33fb17 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -85,7 +85,6 @@ extern bool pci_available; #define PCI_DEVICE_ID_VIRTIO_9P 0x1009 #define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 #define PCI_DEVICE_ID_VIRTIO_PMEM 0x1013 -#define PCI_DEVICE_ID_VIRTIO_MEM 0x1015 =20 #define PCI_VENDOR_ID_REDHAT 0x1b36 #define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001 diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c index be2383b0c522..5c5c1e3ae3da 100644 --- a/hw/virtio/virtio-mem-pci.c +++ b/hw/virtio/virtio-mem-pci.c @@ -104,8 +104,6 @@ static void virtio_mem_pci_class_init(ObjectClass *klas= s, void *data) =20 k->realize =3D virtio_mem_pci_realize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); - pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_MEM; pcidev_k->revision =3D VIRTIO_PCI_ABI_VERSION; pcidev_k->class_id =3D PCI_CLASS_OTHERS; =20 --=20 2.37.3 From nobody Tue Apr 30 14:59:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664546587; cv=none; d=zohomail.com; s=zohoarc; b=UHVLAcC78KI9zyXk8YxEXjCR1CjdiSrxFHdObTIEOWzqYix7c9SYn0MQFKD2qjFnHzix9sfvTJlh7Qo2OEK4fbWYuyH7A4L5Oj75CQCFDJ/T0eiFgJWJVt5i04ltFCSmZmgJYeb4EPROpmknxwbECD7YEe7GpYBNTuRFX0pkV8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664546587; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Snb7ID7q+TjBjyO59QqHnuNN/JYZGcslND5/ZCNSRsA=; b=Ja0RGytlPyAiFjPQy/gmeT23Xe9qmmdtW2jwJiXKQNumWpnupUJoi0ZLEcWPSfg30k12wT6tvWx8rEfu5VomaUPNpQn6gtxJtvH7UO0sRdPFtoeGcvw6a4+7AZRe9hPfK88RV+OeR61XMcw6O7SvnD3b3kplTsC7tajwUTyD0y8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664546587145140.55521154807673; Fri, 30 Sep 2022 07:03:07 -0700 (PDT) Received: from localhost ([::1]:56200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeGbY-0007LL-FN for importer@patchew.org; Fri, 30 Sep 2022 10:03:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGX2-00046l-Ml for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGWx-0002OL-Eb for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:24 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-468-7P5TndJcP7GEjX3uYt1BHg-1; Fri, 30 Sep 2022 09:58:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0CB61101E14E; Fri, 30 Sep 2022 13:58:14 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A7EB240C206B; Fri, 30 Sep 2022 13:58:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 14B5E1800623; Fri, 30 Sep 2022 15:58:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664546297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Snb7ID7q+TjBjyO59QqHnuNN/JYZGcslND5/ZCNSRsA=; b=dODMN2rnuhGttAHxut3IReoVXNfXDNVhVmgVvJyVr/a81/iJ9ii8x6Awjjr5MYeRYGC7La Whb2DNFOX0uo1oEHxkeO5bigyQaHjKy8ji8MoYV2YmiDLHH/LDH7ZbN055fmF6BIwbB8qe zrdrjLxYt935AHmwZ2p35/BfA66ULP4= X-MC-Unique: 7P5TndJcP7GEjX3uYt1BHg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Eric Auger , David Hildenbrand , peter.maydell@linaro.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann Subject: [PATCH v2 3/5] pci-ids: drop PCI_DEVICE_ID_VIRTIO_PMEM Date: Fri, 30 Sep 2022 15:58:08 +0200 Message-Id: <20220930135810.1892149-4-kraxel@redhat.com> In-Reply-To: <20220930135810.1892149-1-kraxel@redhat.com> References: <20220930135810.1892149-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664546588182100001 Content-Type: text/plain; charset="utf-8" Not needed for a virtio 1.0 device. Signed-off-by: Gerd Hoffmann Reviewed-by: David Hildenbrand Reviewed-by: Pankaj Gupta Tested-by: Pankaj Gupta --- include/hw/pci/pci.h | 1 - hw/virtio/virtio-pmem-pci.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index b6aefb33fb17..42c83cb5ed00 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -84,7 +84,6 @@ extern bool pci_available; #define PCI_DEVICE_ID_VIRTIO_RNG 0x1005 #define PCI_DEVICE_ID_VIRTIO_9P 0x1009 #define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 -#define PCI_DEVICE_ID_VIRTIO_PMEM 0x1013 =20 #define PCI_VENDOR_ID_REDHAT 0x1b36 #define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001 diff --git a/hw/virtio/virtio-pmem-pci.c b/hw/virtio/virtio-pmem-pci.c index 2b2a0b1eae10..7d9f4ec189b9 100644 --- a/hw/virtio/virtio-pmem-pci.c +++ b/hw/virtio/virtio-pmem-pci.c @@ -90,8 +90,6 @@ static void virtio_pmem_pci_class_init(ObjectClass *klass= , void *data) =20 k->realize =3D virtio_pmem_pci_realize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); - pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_PMEM; pcidev_k->revision =3D VIRTIO_PCI_ABI_VERSION; pcidev_k->class_id =3D PCI_CLASS_OTHERS; =20 --=20 2.37.3 From nobody Tue Apr 30 14:59:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664546972; cv=none; d=zohomail.com; s=zohoarc; b=DN0t8IvRRW4SRF6SI9W9uFkLog56HOgClw9mKX8cGevbMYPKyFGVZM3WLAezgh1keBm/FI99BKo5Oga7Du3A3xzTw35kz/mYhz9ew/HPbFBj6PugC8ZJ1yabNCn+tCWjgSdUM7Dv7FbpEzyxN4wNAhGGKjSuhKZmzaeB+UwreC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664546972; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XiWuXMrnHYJ64lWJS4tlR3CpP/fqVjBguglbMGWm9EA=; b=FNgoQVgbVKKqwTeeXIhKLLtEM3zF1iFhVLGILXeMDKACCncbeJHFfjXk0ENS7NLW8iEvqBEl1lqA6YJDNzFZcwWgUiZKGY409Y+ToAvAUhp+0ETDrNo3IJi0c5CbiJwguNBnoA7z4+Pp2fxAduPwQquCMONN6V9yGQ2p1drW5+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664546972452970.6497542779272; Fri, 30 Sep 2022 07:09:32 -0700 (PDT) Received: from localhost ([::1]:33138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeGhm-00039U-SJ for importer@patchew.org; Fri, 30 Sep 2022 10:09:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGX1-000455-Nz for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGWy-0002Of-Fc for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:21 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-410-P4vpPl3PM1CpSJvoWN3G2A-1; Fri, 30 Sep 2022 09:58:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5ACF5101E14C; Fri, 30 Sep 2022 13:58:15 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1685F140EBF6; Fri, 30 Sep 2022 13:58:15 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 255691800630; Fri, 30 Sep 2022 15:58:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664546299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XiWuXMrnHYJ64lWJS4tlR3CpP/fqVjBguglbMGWm9EA=; b=Bd1ib+8AAAo+Rw+vd8huXstgdZqKdNldaIiU6xRseyAJf2i4GO2y37bZFifLIUOPNWixZU AXzgvWlsFgd1sX3iO5Bt5Ro3axJzz4fVaZoq5vyNjAeql7N5OwEnTruVWJw1EnGn7hCgl1 O13Vaz5qTWcfvphgmDm9HL/7xodWhQc= X-MC-Unique: P4vpPl3PM1CpSJvoWN3G2A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Eric Auger , David Hildenbrand , peter.maydell@linaro.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann Subject: [PATCH v2 4/5] pci-ids: drop PCI_DEVICE_ID_VIRTIO_VSOCK Date: Fri, 30 Sep 2022 15:58:09 +0200 Message-Id: <20220930135810.1892149-5-kraxel@redhat.com> In-Reply-To: <20220930135810.1892149-1-kraxel@redhat.com> References: <20220930135810.1892149-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664546974915100001 Content-Type: text/plain; charset="utf-8" Not needed for a virtio 1.0 device. Signed-off-by: Gerd Hoffmann --- include/hw/pci/pci.h | 1 - hw/virtio/vhost-user-vsock-pci.c | 2 -- hw/virtio/vhost-vsock-pci.c | 2 -- 3 files changed, 5 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 42c83cb5ed00..fe103f35d9d6 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -83,7 +83,6 @@ extern bool pci_available; #define PCI_DEVICE_ID_VIRTIO_SCSI 0x1004 #define PCI_DEVICE_ID_VIRTIO_RNG 0x1005 #define PCI_DEVICE_ID_VIRTIO_9P 0x1009 -#define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 =20 #define PCI_VENDOR_ID_REDHAT 0x1b36 #define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001 diff --git a/hw/virtio/vhost-user-vsock-pci.c b/hw/virtio/vhost-user-vsock-= pci.c index e5a86e801362..8499b6871f50 100644 --- a/hw/virtio/vhost-user-vsock-pci.c +++ b/hw/virtio/vhost-user-vsock-pci.c @@ -55,8 +55,6 @@ static void vhost_user_vsock_pci_class_init(ObjectClass *= klass, void *data) k->realize =3D vhost_user_vsock_pci_realize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); device_class_set_props(dc, vhost_user_vsock_pci_properties); - pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_VSOCK; pcidev_k->revision =3D 0x00; pcidev_k->class_id =3D PCI_CLASS_COMMUNICATION_OTHER; } diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c index 9f34414d3814..170a806b6765 100644 --- a/hw/virtio/vhost-vsock-pci.c +++ b/hw/virtio/vhost-vsock-pci.c @@ -65,8 +65,6 @@ static void vhost_vsock_pci_class_init(ObjectClass *klass= , void *data) k->realize =3D vhost_vsock_pci_realize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); device_class_set_props(dc, vhost_vsock_pci_properties); - pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_VSOCK; pcidev_k->revision =3D 0x00; pcidev_k->class_id =3D PCI_CLASS_COMMUNICATION_OTHER; } --=20 2.37.3 From nobody Tue Apr 30 14:59:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664547830; cv=none; d=zohomail.com; s=zohoarc; b=R9YpugqCz1OmkRUM0RG9K7XOjwmuabRMElRNqTmk6O1NZNOCvNMfrHhTZ0cuyknfecNp4GvBMZDi1e7cW9FBbcBNJeSoNLf1HHxj6oi5X/P7Y3rFh1zRBqbp0DhRi95VZjxLFjiscrCD8mQBLOdRemE/nMtNPDL2sEtRPARSkwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664547830; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hit5reDY+zV0s5xPyqJVxKPNxv5xgy3vfjKZttxQXHY=; b=ECrnHvSun6qx9+lB0Ar3hfVQc9ln7XZLQH0IYkQivM2rAXEblLOHmyWZjKm7lUdRHEysJHlVSyAymW7tZ0l6FvTnYkgF8CYBBMJ+49/1Jj86lTx4x1rB0iE+aYr4aPgTHqTTjMCHvC6bzvP6SVqnltfdvWNfSoAA5+Iy0Up07P4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664547830810636.7797129173656; Fri, 30 Sep 2022 07:23:50 -0700 (PDT) Received: from localhost ([::1]:37096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeGvd-0002pz-OK for importer@patchew.org; Fri, 30 Sep 2022 10:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGX2-000454-QD for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:30829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeGWv-0002OF-QH for qemu-devel@nongnu.org; Fri, 30 Sep 2022 09:58:20 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-263-cAtD_9Q1MMqEUKAIxtvo-g-1; Fri, 30 Sep 2022 09:58:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F6F32A2AD7A; Fri, 30 Sep 2022 13:58:15 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FBC817582; Fri, 30 Sep 2022 13:58:15 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 321441800634; Fri, 30 Sep 2022 15:58:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664546297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hit5reDY+zV0s5xPyqJVxKPNxv5xgy3vfjKZttxQXHY=; b=YAaHdrGfwO2pLcgOekz3JpIUtuvLX56gdoGVQNKVJmw9VRlPCTj04QxIR0c02BHvIxLpYQ 2JsNIr4KgTNrFQG+nL2v8rLoK8K2bzrV84pbpvTBhHafHqICvGeQ5VgP3ZBnUp118BdcKr lreuV2Cf68Q+g63nqAxZlHfz244k4kA= X-MC-Unique: cAtD_9Q1MMqEUKAIxtvo-g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Eric Auger , David Hildenbrand , peter.maydell@linaro.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann Subject: [PATCH v2 5/5] pci-ids: drop list of modern virtio devices Date: Fri, 30 Sep 2022 15:58:10 +0200 Message-Id: <20220930135810.1892149-6-kraxel@redhat.com> In-Reply-To: <20220930135810.1892149-1-kraxel@redhat.com> References: <20220930135810.1892149-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664547832516100001 Content-Type: text/plain; charset="utf-8" Drop the list of modern virtio devices and explain how they are calculated instead. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Auger --- docs/specs/pci-ids.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt index dd6859d039d0..a289d2de6521 100644 --- a/docs/specs/pci-ids.txt +++ b/docs/specs/pci-ids.txt @@ -23,15 +23,12 @@ maintained as part of the virtio specification. 1af4:1005 entropy generator device (legacy) 1af4:1009 9p filesystem device (legacy) =20 -1af4:1041 network device (modern) -1af4:1042 block device (modern) -1af4:1043 console device (modern) -1af4:1044 entropy generator device (modern) -1af4:1045 balloon device (modern) -1af4:1048 SCSI host bus adapter device (modern) -1af4:1049 9p filesystem device (modern) -1af4:1050 virtio gpu device (modern) -1af4:1052 virtio input device (modern) +1af4:1040 Start of ID range for modern virtio devices. The PCI device + to ID is calculated from the virtio device ID by adding the +1af4:10ef 0x1040 offset. The virtio IDs are defined in the virtio + specification. The Linux kernel has a header file with + defines for all virtio IDs (linux/virtio_ids.h), qemu has a + copy in include/standard-headers/. =20 1af4:10f0 Available for experimental usage without registration. Must get to official ID when the code leaves the test lab (i.e. when seeking --=20 2.37.3