This file needs definition of ARMCPU, and thus, belongs to hw/arm.
Signed-off-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
---
hw/{intc => arm}/arm_gicv3_cpuif_common.c | 2 +-
hw/arm/meson.build | 1 +
hw/intc/meson.build | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
rename hw/{intc => arm}/arm_gicv3_cpuif_common.c (92%)
diff --git a/hw/intc/arm_gicv3_cpuif_common.c b/hw/arm/arm_gicv3_cpuif_common.c
similarity index 92%
rename from hw/intc/arm_gicv3_cpuif_common.c
rename to hw/arm/arm_gicv3_cpuif_common.c
index ff1239f65db..8435ef8cf0d 100644
--- a/hw/intc/arm_gicv3_cpuif_common.c
+++ b/hw/arm/arm_gicv3_cpuif_common.c
@@ -10,7 +10,7 @@
*/
#include "qemu/osdep.h"
-#include "gicv3_internal.h"
+#include "hw/intc/gicv3_internal.h"
#include "cpu.h"
void gicv3_set_gicv3state(CPUState *cpu, GICv3CPUState *s)
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index dc68391305f..9f2eea474b4 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -82,6 +82,7 @@ arm_common_ss.add(when: 'CONFIG_VERSATILE', if_true:
files('versatilepb.c'))
arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c'))
arm_common_ss.add(files('boot.c'))
+arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true:
files('arm_gicv3_cpuif_common.c'))
hw_arch += {'arm': arm_ss}
hw_common_arch += {'arm': arm_common_ss}
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index 3137521a4ad..4578c70dc45 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -38,7 +38,6 @@ if config_all_devices.has_key('CONFIG_APIC') or \
endif
specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c'))
-specific_ss.add(when: 'CONFIG_ARM_GIC', if_true:
files('arm_gicv3_cpuif_common.c'))
specific_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c'))
specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'))
specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true:
files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c'))
--
2.47.2
