From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzGqA-0008N6-6P for qemu-devel@nongnu.org; Wed, 18 Nov 2015 23:28:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzGq9-00077K-4L for qemu-devel@nongnu.org; Wed, 18 Nov 2015 23:28:58 -0500 From: David Gibson Date: Thu, 19 Nov 2015 15:29:20 +1100 Message-Id: <1447907368-9208-5-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1447907368-9208-1-git-send-email-david@gibson.dropbear.id.au> References: <1447907368-9208-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [RFC 04/12] spapr_pci: Fold spapr_phb_vfio_eeh_configure() into spapr_pci code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: gwshan@au1.ibm.com, alex.williamson@redhat.com Cc: aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_configure() into rtas_ibm_configure_pe(). Signed-off-by: David Gibson --- hw/ppc/spapr_pci.c | 11 +++++++++-- hw/ppc/spapr_pci_vfio.c | 12 ------------ include/hw/pci-host/spapr.h | 1 - 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 9203d15..d564351 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -41,6 +41,9 @@ #include "hw/ppc/spapr_drc.h" #include "sysemu/device_tree.h" +#include "hw/vfio/vfio.h" +#include + /* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */ #define RTAS_QUERY_FN 0 #define RTAS_CHANGE_FN 1 @@ -620,8 +623,12 @@ static void rtas_ibm_configure_pe(PowerPCCPU *cpu, goto param_error_exit; } - ret = spapr_phb_vfio_eeh_configure(sphb); - rtas_st(rets, 0, ret); + ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE); + if (ret < 0) { + goto param_error_exit; + } + + rtas_st(rets, 0, RTAS_OUT_SUCCESS); return; param_error_exit: diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index abb8ac0..4408087 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -220,18 +220,6 @@ int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option) return RTAS_OUT_SUCCESS; } -int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb) -{ - int ret; - - ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE); - if (ret < 0) { - return RTAS_OUT_PARAM_ERROR; - } - - return RTAS_OUT_SUCCESS; -} - static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index cc1b82c..f02ef51 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -140,6 +140,5 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, unsigned int addr, int option); int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state); int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option); -int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb); #endif /* __HW_SPAPR_PCI_H__ */ -- 2.5.0