diff options
| author | Yi Min Zhao <zyimin@linux.vnet.ibm.com> | 2016-04-26 14:50:16 +0800 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-05-17 15:50:29 +0200 |
| commit | e141dbadfa405a4ae16515c80a0e215e462a259f (patch) | |
| tree | c5357a3dbffdd6a5baee279b4bcab352f216abe7 | |
| parent | 715838881fdcab07aff26ce2f5fd37a4af8f243f (diff) | |
| download | qemu-e141dbadfa405a4ae16515c80a0e215e462a259f.tar.gz | |
s390x/pci: export pci_dereg_ioat and pci_dereg_irqs
dereg_irqs and dereg_ioat are needed by external functions. Let's
rename and export both of them in s390-pci-inst.h.
Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
| -rw-r--r-- | hw/s390x/s390-pci-inst.c | 10 | ||||
| -rw-r--r-- | hw/s390x/s390-pci-inst.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index eb03f480c4..4b4dd63b5f 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -662,7 +662,7 @@ out: return ret; } -static int dereg_irqs(S390PCIBusDevice *pbdev) +int pci_dereg_irqs(S390PCIBusDevice *pbdev) { release_indicator(&pbdev->routes.adapter, pbdev->summary_ind); release_indicator(&pbdev->routes.adapter, pbdev->indicator); @@ -710,7 +710,7 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib) return 0; } -static void dereg_ioat(S390PCIBusDevice *pbdev) +void pci_dereg_ioat(S390PCIBusDevice *pbdev) { s390_pci_iommu_disable(pbdev); pbdev->pba = 0; @@ -758,7 +758,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) } break; case ZPCI_MOD_FC_DEREG_INT: - dereg_irqs(pbdev); + pci_dereg_irqs(pbdev); break; case ZPCI_MOD_FC_REG_IOAT: if (reg_ioat(env, pbdev, fib)) { @@ -766,10 +766,10 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) } break; case ZPCI_MOD_FC_DEREG_IOAT: - dereg_ioat(pbdev); + pci_dereg_ioat(pbdev); break; case ZPCI_MOD_FC_REREG_IOAT: - dereg_ioat(pbdev); + pci_dereg_ioat(pbdev); if (reg_ioat(env, pbdev, fib)) { cc = ZPCI_PCI_LS_ERR; } diff --git a/hw/s390x/s390-pci-inst.h b/hw/s390x/s390-pci-inst.h index 70fa71395f..9fc94e91cc 100644 --- a/hw/s390x/s390-pci-inst.h +++ b/hw/s390x/s390-pci-inst.h @@ -14,6 +14,7 @@ #ifndef HW_S390_PCI_INST_H #define HW_S390_PCI_INST_H +#include "s390-pci-bus.h" #include <sysemu/dma.h> /* CLP common request & response block size */ @@ -277,6 +278,8 @@ typedef struct ZpciFib { uint32_t gd; } QEMU_PACKED ZpciFib; +int pci_dereg_irqs(S390PCIBusDevice *pbdev); +void pci_dereg_ioat(S390PCIBusDevice *pbdev); int clp_service_call(S390CPU *cpu, uint8_t r2); int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2); int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2); |