From 8dbb04a68fc8f484e4fc34db260529b1b8ee1c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 26 Feb 2026 11:27:18 +0000 Subject: [PATCH] hw/cpu: Build a15mpcore.c once as common object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a15mpcore.c doesn't need to include the target-specific 'kvm_arm.h' header, it only lacks the qemu_get_cpu() declaration which comes from 'hw/core/cpu.h'. Include the latter and build as common object. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20260225034451.41338-1-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/cpu/a15mpcore.c | 2 +- hw/cpu/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 28cc4b3a4b..28cda55ccf 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -22,10 +22,10 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" +#include "hw/core/cpu.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "system/kvm.h" -#include "kvm_arm.h" #include "target/arm/gtimer.h" static void a15mp_priv_set_irq(void *opaque, int irq, int level) diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build index 9d36bf8ae2..9c1535ca32 100644 --- a/hw/cpu/meson.build +++ b/hw/cpu/meson.build @@ -4,4 +4,4 @@ system_ss.add(when: 'CONFIG_CPU_CLUSTER', if_true: files('cluster.c')) system_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c')) system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c')) system_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c')) -specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c')) +system_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))