From nobody Tue Oct 28 12:16:33 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; dkim=fail; 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 1515391150800682.3315554953787; Sun, 7 Jan 2018 21:59:10 -0800 (PST) Received: from localhost ([::1]:40588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYQSk-0006uZ-37 for importer@patchew.org; Mon, 08 Jan 2018 00:59:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYQNw-0003Cb-61 for qemu-devel@nongnu.org; Mon, 08 Jan 2018 00:54:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYQNu-0006VP-EH for qemu-devel@nongnu.org; Mon, 08 Jan 2018 00:54:12 -0500 Received: from ozlabs.org ([103.22.144.67]:47177) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eYQNu-0006Sn-2I; Mon, 08 Jan 2018 00:54:10 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zFPbZ67LQz9sNr; Mon, 8 Jan 2018 16:54:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1515390842; bh=vyjY/u9Y2hObdq6W0VK2yHfLerGAsdn9wRlzLBG7RvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AEZSMijkp02QMusdPVp7dI3PUFWO36Xp/Yr5sBzHj2aOrKmO8uD5DAmyYJ6Ttvnwi 7AuES5MspARaYTHQQjoZHroHCnObPyk6S4Z/XUgV7V/f1htd+H/WlngE67XMydCGXX r+CK75agu2SVV7CJLmZ+AOUWlIWrxigbv3o9yl8M= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 8 Jan 2018 16:53:47 +1100 Message-Id: <20180108055348.20444-12-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180108055348.20444-1-david@gibson.dropbear.id.au> References: <20180108055348.20444-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 11/12] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device 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: Thomas Huth , surajjs@au1.ibm.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth It's a deprecated dummy device since QEMU v2.6.0. That should have been enough time to allow the users to update their scripts in case they still use it, so let's remove this legacy code now. Reviewed-by: Alexey Kardashevskiy Signed-off-by: Thomas Huth Signed-off-by: David Gibson --- hw/ppc/spapr_pci_vfio.c | 47 -------------------------------------------= ---- qemu-doc.texi | 5 ----- scripts/device-crash-test | 1 - 3 files changed, 53 deletions(-) diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 1f775ea93d..053efb03bd 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -29,31 +29,6 @@ #include "qemu/error-report.h" #include "sysemu/qtest.h" =20 -#define TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE "spapr-pci-vfio-host-bridge" - -#define SPAPR_PCI_VFIO_HOST_BRIDGE(obj) \ - OBJECT_CHECK(sPAPRPHBVFIOState, (obj), TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE) - -typedef struct sPAPRPHBVFIOState sPAPRPHBVFIOState; - -struct sPAPRPHBVFIOState { - sPAPRPHBState phb; - - int32_t iommugroupid; -}; - -static Property spapr_phb_vfio_properties[] =3D { - DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1), - DEFINE_PROP_END_OF_LIST(), -}; - -static void spapr_phb_vfio_instance_init(Object *obj) -{ - if (!qtest_enabled()) { - warn_report("spapr-pci-vfio-host-bridge is deprecated"); - } -} - bool spapr_phb_eeh_available(sPAPRPHBState *sphb) { return vfio_eeh_as_ok(&sphb->iommu_as); @@ -218,25 +193,3 @@ int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb) =20 return RTAS_OUT_SUCCESS; } - -static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - dc->props =3D spapr_phb_vfio_properties; -} - -static const TypeInfo spapr_phb_vfio_info =3D { - .name =3D TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE, - .parent =3D TYPE_SPAPR_PCI_HOST_BRIDGE, - .instance_size =3D sizeof(sPAPRPHBVFIOState), - .instance_init =3D spapr_phb_vfio_instance_init, - .class_init =3D spapr_phb_vfio_class_init, -}; - -static void spapr_pci_vfio_register_types(void) -{ - type_register_static(&spapr_phb_vfio_info); -} - -type_init(spapr_pci_vfio_register_types) diff --git a/qemu-doc.texi b/qemu-doc.texi index 90bea7331d..5449695c22 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2744,11 +2744,6 @@ The ``host_net_remove'' command is replaced by the `= `netdev_del'' command. The ``ivshmem'' device type is replaced by either the ``ivshmem-plain'' or ``ivshmem-doorbell`` device types. =20 -@subsection spapr-pci-vfio-host-bridge (since 2.6.0) - -The ``spapr-pci-vfio-host-bridge'' device type is replaced by -the ``spapr-pci-host-bridge'' device type. - @section System emulator machines =20 @subsection Xilinx EP108 (since 2.11.0) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index c11fd81c52..827d8ec2af 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -119,7 +119,6 @@ ERROR_WHITELIST =3D [ {'device':'scsi-generic', 'expected':True}, # drive propert= y not set {'device':'scsi-hd', 'expected':True}, # drive propert= y not set {'device':'spapr-pci-host-bridge', 'expected':True}, # BUID not spec= ified for PHB - {'device':'spapr-pci-vfio-host-bridge', 'expected':True}, # BUID not s= pecified for PHB {'device':'spapr-rng', 'expected':True}, # spapr-rng nee= ds an RNG backend! {'device':'spapr-vty', 'expected':True}, # chardev prope= rty not set {'device':'tpm-tis', 'expected':True}, # tpm_tis: back= end driver with id (null) could not be found --=20 2.14.3