hw/arm: Add missing QOM parent for v7-M SoCs
PATCH 1/1 hw/arm: Add missing QOM parent for v7-M SoCs
QDev objects created with qdev_new() need to manually add their parent relationship with object_property_add_child().
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
--- hw/arm/msf2-som.c | 1 + hw/arm/netduino2.c | 1 + hw/arm/netduinoplus2.c | 1 + hw/arm/olimex-stm32-h405.c | 1 + hw/arm/stm32vldiscovery.c | 1 + 5 files changed, 5 insertions(+)
hw/arm/msf2-som.c +1 -0
@@ -66,6 +66,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)memory_region_add_subregion (sysmem,DDR_BASE_ADDRESS , ddr); dev =qdev_new (TYPE_MSF2_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_prop_set_string (dev,"part-name" ,"M2S010" );qdev_prop_set_string (dev,"cpu-type" , mc->default_cpu_type);
hw/arm/netduino2.c +1 -0
@@ -44,6 +44,7 @@ static void netduino2_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F205_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
hw/arm/netduinoplus2.c +1 -0
@@ -44,6 +44,7 @@ static void netduinoplus2_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F405_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
hw/arm/olimex-stm32-h405.c +1 -0
@@ -47,6 +47,7 @@ static void olimex_stm32_h405_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F405_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
hw/arm/stm32vldiscovery.c +1 -0
@@ -47,6 +47,7 @@ static void stm32vldiscovery_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F100_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
Signature · 1 line
2.41.0
Quoted 5 lines · Philippe Mathieu-Daudé
QDev objects created with
qdev_new()need to manually add their parent relationship withobject_property_add_child().Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Alistair Francis <[email protected]>
Alistair
Quoted 72 lines
--- hw/arm/msf2-som.c | 1 + hw/arm/netduino2.c | 1 + hw/arm/netduinoplus2.c | 1 + hw/arm/olimex-stm32-h405.c | 1 + hw/arm/stm32vldiscovery.c | 1 + 5 files changed, 5 insertions(+)hw/arm/msf2-som.c +1
-0@@ -66,6 +66,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)memory_region_add_subregion (sysmem,DDR_BASE_ADDRESS , ddr); dev =qdev_new (TYPE_MSF2_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_prop_set_string (dev,"part-name" ,"M2S010" );qdev_prop_set_string (dev,"cpu-type" , mc->default_cpu_type);hw/arm/netduino2.c +1
-0@@ -44,6 +44,7 @@ static void netduino2_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F205_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);hw/arm/netduinoplus2.c +1
-0@@ -44,6 +44,7 @@ static void netduinoplus2_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F405_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);hw/arm/olimex-stm32-h405.c +1
-0@@ -47,6 +47,7 @@ static void olimex_stm32_h405_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F405_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);hw/arm/stm32vldiscovery.c +1
-1@@ -47,6 +47,7 @@ static void stm32vldiscovery_init(MachineState *machine)clock_set_hz (sysclk,SYSCLK_FRQ ); dev =qdev_new (TYPE_STM32F100_SOC ); +object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev));qdev_connect_clock_in (dev,"sysclk" , sysclk);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); --2.41.0
Peter Maydell
AppliedQuoted 5 lines · Philippe Mathieu-Daudé
QDev objects created with
qdev_new()need to manually add their parent relationship withobject_property_add_child().Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Applied to target-arm.next, thanks.
-- PMM