On Sat, Dec 12, 2020 at 12:15:32AM +0000, Peter Maydell wrote: > 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.mayd...@linaro.org>
Applied to ppc-for-6.0. > --- > 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 7f1bca928c1..34767b11cad 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; > } > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature