On 1/21/19 7:50 PM, Peter Maydell wrote:
> Rather than just creating the CPUs with object_new, make them child
> objects of the armv7m container. This will allow the cluster code to
> find the CPUs if an armv7m object is made a child of a cluster object.
> object_new_with_props() will do the parenting for us.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> ---
> hw/arm/armv7m.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
> index f9aa83d20ef..0f2c8e066cf 100644
> --- a/hw/arm/armv7m.c
> +++ b/hw/arm/armv7m.c
> @@ -158,7 +158,12 @@ static void armv7m_realize(DeviceState *dev, Error
> **errp)
>
> memory_region_add_subregion_overlap(&s->container, 0, s->board_memory,
> -1);
>
> - s->cpu = ARM_CPU(object_new(s->cpu_type));
> + s->cpu = ARM_CPU(object_new_with_props(s->cpu_type, OBJECT(s), "cpu",
> + &err, NULL));
> + if (err != NULL) {
> + error_propagate(errp, err);
> + return;
> + }
>
> object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",
> &error_abort);
>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
