diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-29 11:46:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-29 11:46:05 +0000 |
| commit | e5b517536cb47989236fbfe5bd69e644a1ff8467 (patch) | |
| tree | d8ea24ddea8cee71a1e1794af35493aaa55dfdfd | |
| parent | b94e809d3e4dbfa986d7c19fd2072c313b9a3a36 (diff) | |
| download | qemu-e5b517536cb47989236fbfe5bd69e644a1ff8467.zip qemu-e5b517536cb47989236fbfe5bd69e644a1ff8467.tar.gz qemu-e5b517536cb47989236fbfe5bd69e644a1ff8467.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190121184314.14311-1-peter.maydell@linaro.org
| -rw-r--r-- | hw/arm/xlnx-zynqmp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index c67ac2e..70cbe6b 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -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); |