Commit fa434424 authored Jan 29, 2019 by Peter Maydell

hw/arm/xlnx-zynqmp: Realize cluster after putting RPUs in it



Currently the cluster implementation doesn't have any constraints
on the ordering of realizing the TYPE_CPU_CLUSTER and populating it
with child objects. We want to impose a constraint that realize
must happen only after all the child objects are added, so move
the realize of rpu_cluster. (The apu_cluster is already
realized after child population.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20190121152218.9592-2-peter.maydell@linaro.org

parent f95c4bff

hw/arm/xlnx-zynqmp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -188,8 +188,6 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState s, const char boot_cpu,
		&error_abort, NULL);
		qdev_prop_set_uint32(DEVICE(&s->rpu_cluster), "cluster-id", 1);

		qdev_init_nofail(DEVICE(&s->rpu_cluster));

		for (i = 0; i < num_rpus; i++) {
		char *name;

		@@ -217,6 +215,8 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState s, const char boot_cpu,
		return;
		}
		}

		qdev_init_nofail(DEVICE(&s->rpu_cluster));
		}

		static void xlnx_zynqmp_init(Object *obj)