hw/arm/exynos4210: Get arm_boot_info declaration from 'hw/arm/boot.h'

[PATCH] hw/arm/exynos4210: Get arm_boot_info declaration from 'hw/arm/boot.h'

Philippe Mathieu-Daudé posted 1 patch 7 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231013130214.95742-1-philmd@linaro.org

Maintainers: Igor Mitsyanko <i.mitsyanko@gmail.com>, Peter Maydell <peter.maydell@linaro.org>

include/hw/arm/exynos4210.h | 2 +-
target/arm/cpu-qom.h        | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)

Expand all Fold all

[PATCH] hw/arm/exynos4210: Get arm_boot_info declaration from 'hw/arm/boot.h'

Posted by Philippe Mathieu-Daudé 7 months ago

struct arm_boot_info is declared in "hw/arm/boot.h".
By including the correct header we don't need to declare
it again in "target/arm/cpu-qom.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/arm/exynos4210.h | 2 +-
 target/arm/cpu-qom.h        | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index 68db19f0cb..d33fe38586 100644
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -30,7 +30,7 @@
 #include "hw/intc/exynos4210_gic.h"
 #include "hw/intc/exynos4210_combiner.h"
 #include "hw/core/split-irq.h"
-#include "target/arm/cpu-qom.h"
+#include "hw/arm/boot.h"
 #include "qom/object.h"
 
 #define EXYNOS4210_NCPUS                    2
diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h
index 514c22ced9..d06c08a734 100644
--- a/target/arm/cpu-qom.h
+++ b/target/arm/cpu-qom.h
@@ -23,8 +23,6 @@
 #include "hw/core/cpu.h"
 #include "qom/object.h"
 
-struct arm_boot_info;
-
 #define TYPE_ARM_CPU "arm-cpu"
 
 OBJECT_DECLARE_CPU_TYPE(ARMCPU, ARMCPUClass, ARM_CPU)
-- 
2.41.0

Re: [PATCH] hw/arm/exynos4210: Get arm_boot_info declaration from 'hw/arm/boot.h'

Posted by Peter Maydell 7 months ago

On Fri, 13 Oct 2023 at 14:02, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> struct arm_boot_info is declared in "hw/arm/boot.h".
> By including the correct header we don't need to declare
> it again in "target/arm/cpu-qom.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Applied to target-arm.next, thanks.

-- PMM

Re: [PATCH] hw/arm/exynos4210: Get arm_boot_info declaration from 'hw/arm/boot.h'

Posted by Richard Henderson 7 months ago

On 10/13/23 06:02, Philippe Mathieu-Daudé wrote:
> struct arm_boot_info is declared in "hw/arm/boot.h".
> By including the correct header we don't need to declare
> it again in "target/arm/cpu-qom.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/arm/exynos4210.h | 2 +-
>   target/arm/cpu-qom.h        | 2 --
>   2 files changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~