[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/17] hw/microblaze/zynqmp: Move the IPI state into
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 12/17] hw/microblaze/zynqmp: Move the IPI state into the PMUSoC state |
Date: |
Fri, 24 May 2019 15:44:42 -0300 |
From: Philippe Mathieu-Daudé <address@hidden>
The Inter Processor Interrupt is a block part of the SoC, not the
"machine" (talking about machine is borderline with the PMU, since
it is embedded into the ZynqMP SoC, but currentl QEMU doesn't
support multi-arch cores).
Move the IPI state to the SoC state, this will simplify the review
of the next patch.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/microblaze/xlnx-zynqmp-pmu.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index 57dc1ccd42..eba9945c19 100644
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -55,6 +55,7 @@ typedef struct XlnxZynqMPPMUSoCState {
/*< public >*/
MicroBlazeCPU cpu;
XlnxPMUIOIntc intc;
+ XlnxZynqMPIPI ipi[XLNX_ZYNQMP_PMU_NUM_IPIS];
} XlnxZynqMPPMUSoCState;
@@ -144,7 +145,6 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *pmu_rom = g_new(MemoryRegion, 1);
MemoryRegion *pmu_ram = g_new(MemoryRegion, 1);
- XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS];
qemu_irq irq[32];
int i;
@@ -172,16 +172,16 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)
/* Create and connect the IPI device */
for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) {
- ipi[i] = g_new0(XlnxZynqMPIPI, 1);
- object_initialize(ipi[i], sizeof(XlnxZynqMPIPI), TYPE_XLNX_ZYNQMP_IPI);
- qdev_set_parent_bus(DEVICE(ipi[i]), sysbus_get_default());
+ object_initialize(&pmu->ipi[i], sizeof(XlnxZynqMPIPI),
+ TYPE_XLNX_ZYNQMP_IPI);
+ qdev_set_parent_bus(DEVICE(&pmu->ipi[i]), sysbus_get_default());
}
for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) {
- object_property_set_bool(OBJECT(ipi[i]), true, "realized",
+ object_property_set_bool(OBJECT(&pmu->ipi[i]), true, "realized",
&error_abort);
- sysbus_mmio_map(SYS_BUS_DEVICE(ipi[i]), 0, ipi_addr[i]);
- sysbus_connect_irq(SYS_BUS_DEVICE(ipi[i]), 0, irq[ipi_irq[i]]);
+ sysbus_mmio_map(SYS_BUS_DEVICE(&pmu->ipi[i]), 0, ipi_addr[i]);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&pmu->ipi[i]), 0, irq[ipi_irq[i]]);
}
/* Load the kernel */
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 01/17] qom/object: Display more helpful message when an object type is missing, (continued)
- [Qemu-devel] [PULL 01/17] qom/object: Display more helpful message when an object type is missing, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 02/17] hw/ppc/pnv: Use object_initialize_child for correct reference counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 03/17] hw/misc/macio: Use object_initialize_child for correct ref. counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 04/17] hw/virtio: Use object_initialize_child for correct reference counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 05/17] hw/arm/bcm2835: Use TYPE_PL011 instead of hardcoded string, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 06/17] hw/arm/bcm2835: Use object_initialize() on PL011State, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 07/17] hw/arm/bcm2835: Use object_initialize_child for correct ref. counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 08/17] hw/arm/aspeed: Use object_initialize_child for correct ref. counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 09/17] hw/arm: Use object_initialize_child for correct reference counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 10/17] hw/mips: Use object_initialize() on MIPSCPSState, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 12/17] hw/microblaze/zynqmp: Move the IPI state into the PMUSoC state,
Eduardo Habkost <=
- [Qemu-devel] [PULL 11/17] hw/mips: Use object_initialize_child for correct reference counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 14/17] hw/microblaze/zynqmp: Use object_initialize_child for correct ref. counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 13/17] hw/microblaze/zynqmp: Let the SoC manage the IPI devices, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 15/17] hw/microblaze/zynqmp: Use object_initialize_child for correct ref. counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 16/17] hw/arm/mps2: Use object_initialize_child for correct reference counting, Eduardo Habkost, 2019/05/24
- [Qemu-devel] [PULL 17/17] hw/intc/nvic: Use object_initialize_child for correct reference counting, Eduardo Habkost, 2019/05/24
- Re: [Qemu-devel] [PULL 00/17] Machine Core queue, 2019-05-24, Peter Maydell, 2019/05/28