[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [RFC 04/12] spapr_pci: Fold spapr_phb_vfio_eeh_configure() in
From: |
David Gibson |
Subject: |
[Qemu-ppc] [RFC 04/12] spapr_pci: Fold spapr_phb_vfio_eeh_configure() into spapr_pci code |
Date: |
Thu, 19 Nov 2015 15:29:20 +1100 |
Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_configure()
into rtas_ibm_configure_pe().
Signed-off-by: David Gibson <address@hidden>
---
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 <linux/vfio.h>
+
/* 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
- [Qemu-ppc] [RFC 00/12] Merge EEH support into spapr-pci-host-bridge, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 04/12] spapr_pci: Fold spapr_phb_vfio_eeh_configure() into spapr_pci code,
David Gibson <=
- [Qemu-ppc] [RFC 01/12] vfio: Start improving VFIO/EEH interface, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 11/12] spapr_pci: Remove finish_realize hook, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 10/12] spapr_pci: (Mostly) remove spapr-pci-vfio-host-bridge, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 06/12] spapr_pci: Fold spapr_phb_vfio_eeh_get_state() into spapr_pci code, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 09/12] spapr_pci: Allow EEH on spapr-pci-host-bridge, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 07/12] spapr_pci: Fold spapr_phb_vfio_eeh_set_option() into spapr_pci code, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 08/12] spapr_pci: Fold spapr_phb_vfio_reset() into spapr_pci code, David Gibson, 2015/11/18
- [Qemu-ppc] [RFC 12/12] vfio: Eliminate vfio_container_ioctl(), David Gibson, 2015/11/18