On 4/4/25 01:58, Philippe Mathieu-Daudé wrote:
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
XXX untested
Now with Xen setup accessible, so tested. What is missing:
-- >8 --
diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c
index d1509bd235..8e81947c7d 100644
--- a/hw/arm/xen-pvh.c
+++ b/hw/arm/xen-pvh.c
@@ -12,3 +12,2 @@
#include "hw/xen/xen-pvh-common.h"
-#include "hw/xen/arch_hvm.h"
diff --git a/hw/arm/xen-stubs.c b/hw/arm/xen-stubs.c
index 5551584dc2..f3681835d7 100644
--- a/hw/arm/xen-stubs.c
+++ b/hw/arm/xen-stubs.c
@@ -11,3 +11,3 @@
#include "hw/xen/xen-hvm-common.h"
-#include "hw/xen/arch_hvm.h"
+#include "hw/arm/xen_arch_hvm.h"
---
Otherwise we get:
In file included from ../../hw/arm/xen-pvh.c:13:
include/hw/xen/arch_hvm.h:1:13: error: attempt to use poisoned "TARGET_I386"
1 | #if defined(TARGET_I386) || defined(TARGET_X86_64)
| ^
include/hw/xen/arch_hvm.h:1:37: error: attempt to use poisoned
"TARGET_X86_64"
1 | #if defined(TARGET_I386) || defined(TARGET_X86_64)
| ^
---
hw/arm/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index c46e5036722..61f145f901f 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -63,7 +63,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true:
files('imx8mp-evk.c'))
arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c'))
arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c',
'mcimx6ul-evk.c'))
arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
-arm_ss.add(when: 'CONFIG_XEN', if_true: files(
+arm_common_ss.add(when: 'CONFIG_XEN', if_true: files(
'xen-stubs.c',
'xen-pvh.c',
))
