[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/22] hw/ppc/virtex_ml507: Drop use of ppcuic_init()
From: |
David Gibson |
Subject: |
[PULL 03/22] hw/ppc/virtex_ml507: Drop use of ppcuic_init() |
Date: |
Wed, 6 Jan 2021 14:37:57 +1100 |
From: Peter Maydell <peter.maydell@linaro.org>
Switch the virtex_ml507 board to directly creating and
configuring the UIC, rather than doing it via the old
ppcuic_init() helper function.
This fixes a trivial Coverity-detected memory leak where
we were leaking the array of IRQs returned by ppcuic_init().
Fixes: Coverity CID 1421992
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20201212001537.24520-4-peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/ppc/virtex_ml507.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 07fe49da0d..b26ff17767 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -43,6 +43,7 @@
#include "qemu/option.h"
#include "exec/address-spaces.h"
+#include "hw/intc/ppc-uic.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
#include "hw/qdev-properties.h"
@@ -95,7 +96,8 @@ static PowerPCCPU *ppc440_init_xilinx(const char *cpu_type,
uint32_t sysclk)
{
PowerPCCPU *cpu;
CPUPPCState *env;
- qemu_irq *irqs;
+ DeviceState *uicdev;
+ SysBusDevice *uicsbd;
cpu = POWERPC_CPU(cpu_create(cpu_type));
env = &cpu->env;
@@ -105,10 +107,19 @@ static PowerPCCPU *ppc440_init_xilinx(const char
*cpu_type, uint32_t sysclk)
ppc_dcr_init(env, NULL, NULL);
/* interrupt controller */
- irqs = g_new0(qemu_irq, PPCUIC_OUTPUT_NB);
- irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT];
- irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq
*)env->irq_inputs)[PPC40x_INPUT_CINT];
- ppcuic_init(env, irqs, 0x0C0, 0, 1);
+ uicdev = qdev_new(TYPE_PPC_UIC);
+ uicsbd = SYS_BUS_DEVICE(uicdev);
+
+ object_property_set_link(OBJECT(uicdev), "cpu", OBJECT(cpu),
+ &error_fatal);
+ sysbus_realize_and_unref(uicsbd, &error_fatal);
+
+ sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_INT,
+ ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]);
+ sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_CINT,
+ ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]);
+
+ /* This board doesn't wire anything up to the inputs of the UIC. */
return cpu;
}
--
2.29.2
- [PULL 00/22] ppc-for-6.0 queue 20210106, David Gibson, 2021/01/05
- [PULL 03/22] hw/ppc/virtex_ml507: Drop use of ppcuic_init(),
David Gibson <=
- [PULL 01/22] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code, David Gibson, 2021/01/05
- [PULL 02/22] ppc: Convert PPC UIC to a QOM device, David Gibson, 2021/01/05
- [PULL 04/22] hw/ppc/ppc440_bamboo: Drop use of ppcuic_init(), David Gibson, 2021/01/05
- [PULL 06/22] spapr/xive: Make spapr_xive_pic_print_info() static, David Gibson, 2021/01/05
- [PULL 12/22] spapr: Introduce spapr_drc_reset_all(), David Gibson, 2021/01/05
- [PULL 11/22] spapr: Fix reset of transient DR connectors, David Gibson, 2021/01/05
- [PULL 10/22] spapr: Call spapr_drc_reset() for all DRCs at CAS, David Gibson, 2021/01/05
- [PULL 05/22] spapr: DRC lookup cannot fail, David Gibson, 2021/01/05
- [PULL 09/22] spapr: Fix buffer overflow in spapr_numa_associativity_init(), David Gibson, 2021/01/05
- [PULL 07/22] spapr: Fix DR properties of the root node, David Gibson, 2021/01/05