From 2e6a9f464fd1f247c41ce3666ff3e3f66920d0b7 Mon Sep 17 00:00:00 2001 From: Vikram Garhwal Date: Fri, 1 Jul 2022 17:28:15 -0700 Subject: [PATCH 09/16] xen-hvm: enable xen-hvm-common build for ARM Add CONFIG_XEN for aarch64 device and change xen-hvm-common.c to support build for ARM targets. Signed-off-by: Vikram Garhwal Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/arm/meson.build | 1 + meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 92f9f6e000..3aac913bfd 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -62,5 +62,6 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre. arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) +arm_ss.add_all(xen_ss) hw_arch += {'arm': arm_ss} diff --git a/meson.build b/meson.build index 5c6b5a1c75..b94f0cd76e 100644 --- a/meson.build +++ b/meson.build @@ -125,7 +125,7 @@ endif if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] # i386 emulator provides xenpv machine type for multiple architectures accelerator_targets += { - 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'], } endif if cpu in ['x86', 'x86_64'] -- 2.17.1