[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/30] spapr: Don't use qdev_get_machine() in spapr_msi_write()
From: |
David Gibson |
Subject: |
[PULL 28/30] spapr: Don't use qdev_get_machine() in spapr_msi_write() |
Date: |
Fri, 11 Dec 2020 15:15:05 +1100 |
From: Greg Kurz <groug@kaod.org>
spapr_phb_realize() passes the sPAPR machine state as opaque data
for the I/O callbacks:
memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,
^^^^^
"msi", msi_window_size);
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20201209170052.1431440-5-groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/ppc/spapr_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index cff76479c7..76d7c91e9c 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -747,7 +747,7 @@ static PCIINTxRoute spapr_route_intx_pin_to_irq(void
*opaque, int pin)
static void spapr_msi_write(void *opaque, hwaddr addr,
uint64_t data, unsigned size)
{
- SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
+ SpaprMachineState *spapr = opaque;
uint32_t irq = data;
trace_spapr_pci_msi_write(addr, data, irq);
--
2.29.2
- [PULL 13/30] ppc/translate: Raise exceptions after setting the cc, (continued)
- [PULL 13/30] ppc/translate: Raise exceptions after setting the cc, David Gibson, 2020/12/10
- [PULL 19/30] spapr: Simplify error path of spapr_core_plug(), David Gibson, 2020/12/10
- [PULL 23/30] MAINTAINERS: Add Greg Kurz as co-maintainer for ppc, David Gibson, 2020/12/10
- [PULL 21/30] target/ppc: Remove "compat" property of server class POWER CPUs, David Gibson, 2020/12/10
- [PULL 30/30] spapr.c: set a 'kvm-type' default value instead of relying on NULL, David Gibson, 2020/12/10
- [PULL 18/30] spapr: Abort if ppc_set_compat() fails for hot-plugged CPUs, David Gibson, 2020/12/10
- [PULL 17/30] spapr: Fix pre-2.10 dummy ICP hack, David Gibson, 2020/12/10
- [PULL 27/30] spapr: Pass sPAPR machine state down to spapr_pci_switch_vga(), David Gibson, 2020/12/10
- [PULL 25/30] ppc/translate: Use POWERPC_MMU_64 to detect 64-bit MMU models, David Gibson, 2020/12/10
- [PULL 29/30] spapr: Pass sPAPR machine state to some RTAS events handling functions, David Gibson, 2020/12/10
- [PULL 28/30] spapr: Don't use qdev_get_machine() in spapr_msi_write(),
David Gibson <=
- [PULL 26/30] target/ppc: Introduce an mmu_is_64bit() helper, David Gibson, 2020/12/10
- [PULL 22/30] hw/ppc: Do not re-read the clock on pre_save if doing savevm, David Gibson, 2020/12/10
- [PULL 20/30] spapr: spapr_drc_attach() cannot fail, David Gibson, 2020/12/10
- [PULL 24/30] ppc/e500: Free irqs array to avoid memleak, David Gibson, 2020/12/10
- Re: [PULL 00/30] ppc-for-6.0 queue 20201211, Philippe Mathieu-Daudé, 2020/12/11