From nobody Thu May 2 08:55:07 2024 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511799209412629.5625874074644; Mon, 27 Nov 2017 08:13:29 -0800 (PST) Received: from localhost ([::1]:33482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJM1v-0008HH-Mx for importer@patchew.org; Mon, 27 Nov 2017 11:13:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJM14-0007sg-2o for qemu-devel@nongnu.org; Mon, 27 Nov 2017 11:12:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJM0x-0007Fh-MS for qemu-devel@nongnu.org; Mon, 27 Nov 2017 11:12:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eJM0n-0007BR-MD; Mon, 27 Nov 2017 11:12:01 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C196C8047F; Mon, 27 Nov 2017 16:11:59 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.35.7.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E16F60176; Mon, 27 Nov 2017 16:11:46 +0000 (UTC) From: Yoni Bettan To: qemu-devel@nongnu.org Date: Mon, 27 Nov 2017 18:10:48 +0200 Message-Id: <20171127161048.22447-1-ybettan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 27 Nov 2017 16:11:59 +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] pci: removed the is_express field since a uniform interface was inserted 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: Kevin Wolf , Hannes Reinecke , "open list:nvme" , "Michael S. Tsirkin" , Yoni Bettan , Alex Williamson , Max Reitz , Keith Busch , Marcel Apfelbaum , Paul Burton , Gerd Hoffmann , Dmitry Fleytman , Paolo Bonzini , Jason Wang 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" * according to Eduardo Habkost's commit fd3b02c8896d597dd8b9e053dec579cf0386aee1 * since all PCIEs now implement INTERFACE_PCIE_DEVICE we don't need this field anymore Signed-off-by: Yoni Bettan --- hw/block/nvme.c | 1 - hw/net/e1000e.c | 1 - hw/pci-bridge/pcie_pci_bridge.c | 1 - hw/pci-bridge/pcie_root_port.c | 1 - hw/pci-bridge/xio3130_downstream.c | 1 - hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/xilinx-pcie.c | 1 - hw/pci/pci.c | 3 ++- hw/scsi/megasas.c | 1 - hw/usb/hcd-xhci.c | 1 - hw/vfio/pci.c | 1 - include/hw/pci/pci.h | 3 --- 12 files changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 441e21ed1f..9325bc0911 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1087,7 +1087,6 @@ static void nvme_class_init(ObjectClass *oc, void *da= ta) pc->vendor_id =3D PCI_VENDOR_ID_INTEL; pc->device_id =3D 0x5845; pc->revision =3D 2; - pc->is_express =3D 1; =20 set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->desc =3D "Non-Volatile Memory Express"; diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index f1af279e8d..c360f0d8c9 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -675,7 +675,6 @@ static void e1000e_class_init(ObjectClass *class, void = *data) c->revision =3D 0; c->romfile =3D "efi-e1000e.rom"; c->class_id =3D PCI_CLASS_NETWORK_ETHERNET; - c->is_express =3D 1; =20 dc->desc =3D "Intel 82574L GbE Controller"; dc->reset =3D e1000e_qdev_reset; diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridg= e.c index a4d827c99d..b7d9ebbec2 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -169,7 +169,6 @@ static void pcie_pci_bridge_class_init(ObjectClass *kla= ss, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); =20 - k->is_express =3D 1; k->is_bridge =3D 1; k->vendor_id =3D PCI_VENDOR_ID_REDHAT; k->device_id =3D PCI_DEVICE_ID_REDHAT_PCIE_BRIDGE; diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index 9b6e4ce512..45f9e8cd4a 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -145,7 +145,6 @@ static void rp_class_init(ObjectClass *klass, void *dat= a) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->is_express =3D 1; k->is_bridge =3D 1; k->config_write =3D rp_write_config; k->realize =3D rp_realize; diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_dow= nstream.c index 1e09d2afb7..613a0d6bb7 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -177,7 +177,6 @@ static void xio3130_downstream_class_init(ObjectClass *= klass, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->is_express =3D 1; k->is_bridge =3D 1; k->config_write =3D xio3130_downstream_write_config; k->realize =3D xio3130_downstream_realize; diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstr= eam.c index 227997ce46..d4645bddee 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -148,7 +148,6 @@ static void xio3130_upstream_class_init(ObjectClass *kl= ass, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->is_express =3D 1; k->is_bridge =3D 1; k->config_write =3D xio3130_upstream_write_config; k->realize =3D xio3130_upstream_realize; diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 7659253090..a4ca3ba30f 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -298,7 +298,6 @@ static void xilinx_pcie_root_class_init(ObjectClass *kl= ass, void *data) k->device_id =3D 0x7021; k->revision =3D 0; k->class_id =3D PCI_CLASS_BRIDGE_HOST; - k->is_express =3D true; k->is_bridge =3D true; k->init =3D xilinx_pcie_root_init; k->exit =3D pci_bridge_exitfn; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index b2d139bd9a..02f6f2f37a 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2014,12 +2014,13 @@ static void pci_qdev_realize(DeviceState *qdev, Err= or **errp) { PCIDevice *pci_dev =3D (PCIDevice *)qdev; PCIDeviceClass *pc =3D PCI_DEVICE_GET_CLASS(pci_dev); + ObjectClass *klass =3D &(pc->parent_class.parent_class); Error *local_err =3D NULL; PCIBus *bus; bool is_default_rom; =20 /* initialize cap_present for pci_is_express() and pci_config_size() */ - if (pc->is_express) { + if (object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE)) { pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; } =20 diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index d5eae6239a..987c064e4b 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2506,7 +2506,6 @@ static void megasas_class_init(ObjectClass *oc, void = *data) pc->subsystem_vendor_id =3D PCI_VENDOR_ID_LSI_LOGIC; pc->subsystem_id =3D info->subsystem_id; pc->class_id =3D PCI_CLASS_STORAGE_RAID; - pc->is_express =3D info->is_express; e->mmio_bar =3D info->mmio_bar; e->ioport_bar =3D info->ioport_bar; e->osts =3D info->osts; diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index af3a9d88de..12e12f4f21 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3661,7 +3661,6 @@ static void xhci_class_init(ObjectClass *klass, void = *data) k->realize =3D usb_xhci_realize; k->exit =3D usb_xhci_exit; k->class_id =3D PCI_CLASS_SERIAL_USB; - k->is_express =3D 1; } =20 static const TypeInfo xhci_info =3D { diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index c977ee327f..d2c1d47148 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3026,7 +3026,6 @@ static void vfio_pci_dev_class_init(ObjectClass *klas= s, void *data) pdc->exit =3D vfio_exitfn; pdc->config_read =3D vfio_pci_read_config; pdc->config_write =3D vfio_pci_write_config; - pdc->is_express =3D 1; /* We might be */ } =20 static const TypeInfo vfio_pci_dev_info =3D { diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 8d02a0a383..a27be85111 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -236,9 +236,6 @@ typedef struct PCIDeviceClass { */ int is_bridge; =20 - /* pcie stuff */ - int is_express; /* is this device pci express? */ - /* rom bar */ const char *romfile; } PCIDeviceClass; --=20 2.13.6