A15MPPrivState doesn't contain anything else but its parent, CortexMPPrivState. Remove it in favor of the parent.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- include/hw/arm/aspeed_soc.h | 2 +- include/hw/arm/fsl-imx6ul.h | 2 +- include/hw/arm/fsl-imx7.h | 2 +- include/hw/cpu/cortex_mpcore.h | 5 ----- hw/cpu/a15mpcore.c | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index e0663ab50d..2f51d78e22 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -108,7 +108,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2400SoCState, ASPEED2400_SOC) struct Aspeed2600SoCState { AspeedSoCState parent; - A15MPPrivState a7mpcore; + CortexMPPrivState a7mpcore; ARMCPU cpu[ASPEED_CPUS_NUM]; /* XXX belong to a7mpcore */ }; diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 5ed22004d1..b37d544319 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -68,7 +68,7 @@ struct FslIMX6ULState { /*< public >*/ ARMCPU cpu; - A15MPPrivState a7mpcore; + CortexMPPrivState a7mpcore; IMXGPTState gpt[FSL_IMX6UL_NUM_GPTS]; IMXEPITState epit[FSL_IMX6UL_NUM_EPITS]; IMXGPIOState gpio[FSL_IMX6UL_NUM_GPIOS]; diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 87faee33c2..a6f3a96029 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -68,7 +68,7 @@ struct FslIMX7State { /*< public >*/ ARMCPU cpu[FSL_IMX7_NUM_CPUS]; - A15MPPrivState a7mpcore; + CortexMPPrivState a7mpcore; IMXGPTState gpt[FSL_IMX7_NUM_GPTS]; IMXGPIOState gpio[FSL_IMX7_NUM_GPIOS]; IMX7CCMState ccm; diff --git a/include/hw/cpu/cortex_mpcore.h b/include/hw/cpu/cortex_mpcore.h index 73627bc415..7822d5cbc4 100644 --- a/include/hw/cpu/cortex_mpcore.h +++ b/include/hw/cpu/cortex_mpcore.h @@ -117,10 +117,5 @@ struct A9MPPrivState { }; #define TYPE_A15MPCORE_PRIV "a15mpcore_priv" -OBJECT_DECLARE_SIMPLE_TYPE(A15MPPrivState, A15MPCORE_PRIV) - -struct A15MPPrivState { - CortexMPPrivState parent_obj; -}; #endif diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index ecd04b7af1..87b0786781 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -125,7 +125,7 @@ static const TypeInfo a15mp_types[] = { { .name = TYPE_A15MPCORE_PRIV, .parent = TYPE_CORTEX_MPCORE_PRIV, - .instance_size = sizeof(A15MPPrivState), + .instance_size = sizeof(CortexMPPrivState), .class_init = a15mp_priv_class_init, }, }; -- 2.41.0