[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GE
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS() |
Date: |
Tue, 21 Aug 2018 14:33:42 +1000 |
From: Cédric Le Goater <address@hidden>
It should save us some CPU cycles as these routines perform a lot of
checks.
Signed-off-by: Cédric Le Goater <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_pci.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 3791ced6c5..5cd676e443 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -267,6 +267,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu,
sPAPRMachineState *spapr,
target_ulong args, uint32_t nret,
target_ulong rets)
{
+ sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
uint32_t config_addr = rtas_ld(args, 0);
uint64_t buid = rtas_ldq(args, 1);
unsigned int func = rtas_ld(args, 3);
@@ -334,7 +335,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu,
sPAPRMachineState *spapr,
return;
}
- if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
+ if (!smc->legacy_irq_allocation) {
spapr_irq_msi_free(spapr, msi->first_irq, msi->num);
}
spapr_irq_free(spapr, msi->first_irq, msi->num);
@@ -375,7 +376,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu,
sPAPRMachineState *spapr,
}
/* Allocate MSIs */
- if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
+ if (smc->legacy_irq_allocation) {
irq = spapr_irq_find(spapr, req_num, ret_intr_type == RTAS_TYPE_MSI,
&err);
} else {
@@ -401,7 +402,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu,
sPAPRMachineState *spapr,
/* Release previous MSIs */
if (msi) {
- if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
+ if (!smc->legacy_irq_allocation) {
spapr_irq_msi_free(spapr, msi->first_irq, msi->num);
}
spapr_irq_free(spapr, msi->first_irq, msi->num);
@@ -1558,6 +1559,7 @@ static void spapr_phb_realize(DeviceState *dev, Error
**errp)
sPAPRMachineState *spapr =
(sPAPRMachineState *) object_dynamic_cast(qdev_get_machine(),
TYPE_SPAPR_MACHINE);
+ sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
SysBusDevice *s = SYS_BUS_DEVICE(dev);
sPAPRPHBState *sphb = SPAPR_PCI_HOST_BRIDGE(s);
PCIHostState *phb = PCI_HOST_BRIDGE(s);
@@ -1575,7 +1577,6 @@ static void spapr_phb_realize(DeviceState *dev, Error
**errp)
}
if (sphb->index != (uint32_t)-1) {
- sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
Error *local_err = NULL;
smc->phb_placement(spapr, sphb->index,
@@ -1720,7 +1721,7 @@ static void spapr_phb_realize(DeviceState *dev, Error
**errp)
uint32_t irq = SPAPR_IRQ_PCI_LSI + sphb->index * PCI_NUM_PINS + i;
Error *local_err = NULL;
- if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
+ if (smc->legacy_irq_allocation) {
irq = spapr_irq_findone(spapr, &local_err);
if (local_err) {
error_propagate(errp, local_err);
--
2.17.1
- [Qemu-ppc] [PULL 08/26] target/ppc: Honor fpscr_ze semantics and tidy fre, fresqrt, (continued)
- [Qemu-ppc] [PULL 08/26] target/ppc: Honor fpscr_ze semantics and tidy fre, fresqrt, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 05/26] target/ppc: Tidy helper_fmul, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 20/26] hw/ppc: deprecate the machine type 'prep', replaced by '40p', David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 18/26] hw/ppc/ppc405_uc: Convert away from old_mmio, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 22/26] 40p: don't use legacy fw_cfg_init_mem() function, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 16/26] hw/ppc/prep: Remove ifdeffed-out stub of XCSR code, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 26/26] ppc: add DBCR based debugging, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 19/26] spapr: introduce a IRQ controller backend to the machine, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 15/26] spapr: introduce a fixed IRQ number space, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 09/26] target/ppc: Use non-arithmetic conversions for fp load/store, David Gibson, 2018/08/21
- [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(),
David Gibson <=
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Peter Maydell, 2018/08/24
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Cédric Le Goater, 2018/08/24
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Greg Kurz, 2018/08/24
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Cédric Le Goater, 2018/08/24
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Thomas Huth, 2018/08/27
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Greg Kurz, 2018/08/27
- Re: [Qemu-ppc] [PULL 25/26] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS(), Greg Kurz, 2018/08/27
[Qemu-ppc] [PULL 21/26] qemu-doc: mark ppc/prep machine as deprecated, David Gibson, 2018/08/21
Re: [Qemu-ppc] [PULL 00/26] ppc-for-3.1 queue 20180821, Peter Maydell, 2018/08/21
[Qemu-ppc] [PULL 02/26] pseries: Update SLOF firmware image, David Gibson, 2018/08/21