Commit e5b51753 authored by Peter Maydell's avatar Peter Maydell
Browse files

xlnx-zynqmp: Don't create rpu-cluster if there are no RPUs 



If we aren't going to create any RPUs, then don't create the
rpu-cluster unit. This allows us to add an assertion to the
cluster object that it contains at least one CPU, which helps
to avoid bugs in creating clusters and putting CPUs in them.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190121184314.14311-1-peter.maydell@linaro.org
parent b94e809d

hw/arm/xlnx-zynqmp.c

+5 −0
Original line number Diff line number Diff line
@@ -178,6 +178,11 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, 
    int i;

    int num_rpus = MIN(smp_cpus - XLNX_ZYNQMP_NUM_APU_CPUS, XLNX_ZYNQMP_NUM_RPU_CPUS);



    if (num_rpus <= 0) {

        /* Don't create rpu-cluster object if there's nothing to put in it */

        return;

    }



    object_initialize_child(OBJECT(s), "rpu-cluster", &s->rpu_cluster,

                            sizeof(s->rpu_cluster), TYPE_CPU_CLUSTER,

                            &error_abort, NULL);