[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 06/12] spapr_pci: Fold spapr_phb_vfio_eeh_get_state()
From: |
David Gibson |
Subject: |
[Qemu-devel] [RFC 06/12] spapr_pci: Fold spapr_phb_vfio_eeh_get_state() into spapr_pci code |
Date: |
Thu, 19 Nov 2015 15:29:22 +1100 |
Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_get_state9)
into rtas_ibm_read_slot_reset_state2().
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_pci.c | 12 ++++++------
hw/ppc/spapr_pci_vfio.c | 13 -------------
include/hw/pci-host/spapr.h | 1 -
3 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 76214ec..a13eff3 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -531,7 +531,7 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu,
{
sPAPRPHBState *sphb;
uint64_t buid;
- int state, ret;
+ int ret;
if ((nargs != 3) || (nret != 4 && nret != 5)) {
goto param_error_exit;
@@ -547,13 +547,13 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU
*cpu,
goto param_error_exit;
}
- ret = spapr_phb_vfio_eeh_get_state(sphb, &state);
- rtas_st(rets, 0, ret);
- if (ret != RTAS_OUT_SUCCESS) {
- return;
+ ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE);
+ if (ret < 0) {
+ goto param_error_exit;
}
- rtas_st(rets, 1, state);
+ rtas_st(rets, 0, RTAS_OUT_SUCCESS);
+ rtas_st(rets, 1, ret);
rtas_st(rets, 2, RTAS_EEH_SUPPORT);
rtas_st(rets, 3, RTAS_EEH_PE_UNAVAIL_INFO);
if (nret >= 5) {
diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index 0872dbf..8ca9fb3 100644
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -135,19 +135,6 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb,
return RTAS_OUT_SUCCESS;
}
-int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state)
-{
- int ret;
-
- ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE);
- if (ret < 0) {
- return RTAS_OUT_PARAM_ERROR;
- }
-
- *state = ret;
- 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 d31162b..55237fc 100644
--- a/include/hw/pci-host/spapr.h
+++ b/include/hw/pci-host/spapr.h
@@ -138,6 +138,5 @@ void spapr_phb_vfio_reset(DeviceState *qdev);
/* VFIO EEH hooks */
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);
#endif /* __HW_SPAPR_PCI_H__ */
--
2.5.0
- Re: [Qemu-devel] [RFC 01/12] vfio: Start improving VFIO/EEH interface, (continued)
- [Qemu-devel] [RFC 07/12] spapr_pci: Fold spapr_phb_vfio_eeh_set_option() into spapr_pci code, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 08/12] spapr_pci: Fold spapr_phb_vfio_reset() into spapr_pci code, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 10/12] spapr_pci: (Mostly) remove spapr-pci-vfio-host-bridge, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 05/12] spapr_pci: Fold spapr_phb_vfio_eeh_reset() into spapr_pci code, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 02/12] spapr_pci: Switch to vfio_eeh_as_op() interface, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 11/12] spapr_pci: Remove finish_realize hook, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 03/12] spapr_pci: Eliminate class callbacks, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 06/12] spapr_pci: Fold spapr_phb_vfio_eeh_get_state() into spapr_pci code,
David Gibson <=
- [Qemu-devel] [RFC 09/12] spapr_pci: Allow EEH on spapr-pci-host-bridge, David Gibson, 2015/11/18
- [Qemu-devel] [RFC 12/12] vfio: Eliminate vfio_container_ioctl(), David Gibson, 2015/11/18