On 07/16/2017 11:38 PM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/arm/armv7m.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
> index 8efc4e8..1c837da 100644
> --- a/hw/arm/armv7m.c
> +++ b/hw/arm/armv7m.c
> @@ -132,12 +132,6 @@ static void armv7m_instance_init(Object *obj)
>
> /* Can't init the cpu here, we don't yet know which model to use */
>
> - object_property_add_link(obj, "memory",
> - TYPE_MEMORY_REGION,
> - (Object **)&s->board_memory,
> - qdev_prop_allow_set_link_before_realize,
> - OBJ_PROP_LINK_UNREF_ON_RELEASE,
> - &error_abort);
> memory_region_init(&s->container, obj, "armv7m-container", UINT64_MAX);
>
> object_initialize(&s->nvic, sizeof(s->nvic), "armv7m_nvic");
> @@ -248,6 +242,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
>
> static Property armv7m_properties[] = {
> DEFINE_PROP_STRING("cpu-model", ARMv7MState, cpu_model),
> + DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
> + MemoryRegion *),
> DEFINE_PROP_END_OF_LIST(),
> };
>
>