summary refs log tree commit diff stats
path: root/hw/misc/imx6_src.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2022-12-14 14:27:14 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-12-15 17:37:47 +0000
commit3d81e8cf0c81b8b63d7d7056c450dd94bfbfd038 (patch)
treeba4c2c21fac46b79d91fcb4a01caff88528d697c /hw/misc/imx6_src.c
parent990f49cfd700ff72933949769276dfa5a74ce36e (diff)
downloadfocaccia-qemu-3d81e8cf0c81b8b63d7d7056c450dd94bfbfd038.tar.gz
focaccia-qemu-3d81e8cf0c81b8b63d7d7056c450dd94bfbfd038.zip
hw/misc: Move some arm-related files from specific_ss into softmmu_ss
The header target/arm/kvm-consts.h checks CONFIG_KVM which is marked as
poisoned in common code, so the files that include this header have to
be added to specific_ss and recompiled for each, qemu-system-arm and
qemu-system-aarch64. However, since the kvm headers are only optionally
used in kvm-constants.h for some sanity checks, we can additionally
check the NEED_CPU_H macro first to avoid the poisoned CONFIG_KVM macro,
so kvm-constants.h can also be used from "common" files (without the
sanity checks - which should be OK since they are still done from other
target-specific files instead). This way, and by adjusting some other
include statements in the related files here and there, we can move some
files from specific_ss into softmmu_ss, so that they only need to be
compiled once during the build process.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20221202154023.293614-1-thuth@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/imx6_src.c')
-rw-r--r--hw/misc/imx6_src.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c
index 7b0e968804..a9c64d06eb 100644
--- a/hw/misc/imx6_src.c
+++ b/hw/misc/imx6_src.c
@@ -15,7 +15,7 @@
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "arm-powerctl.h"
+#include "target/arm/arm-powerctl.h"
 #include "hw/core/cpu.h"
 
 #ifndef DEBUG_IMX6_SRC