[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 17/19] arm: Add Hypervisor.framework build target
From: |
Alexander Graf |
Subject: |
[PATCH v7 17/19] arm: Add Hypervisor.framework build target |
Date: |
Sun, 16 May 2021 21:58:53 +0200 |
Now that we have all logic in place that we need to handle Hypervisor.framework
on Apple Silicon systems, let's add CONFIG_HVF for aarch64 as well so that we
can build it.
Signed-off-by: Alexander Graf <agraf@csgraf.de>
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Tested-by: Roman Bolshakov <r.bolshakov@yadro.com> (x86 only)
---
v1 -> v2:
- Fix build on 32bit arm
v3 -> v4:
- Remove i386-softmmu target
v6 -> v7:
- Simplify HVF matching logic in meson build file
---
meson.build | 7 +++++++
target/arm/hvf/meson.build | 3 +++
target/arm/meson.build | 2 ++
3 files changed, 12 insertions(+)
create mode 100644 target/arm/hvf/meson.build
diff --git a/meson.build b/meson.build
index 0ec7002286..551ad458ea 100644
--- a/meson.build
+++ b/meson.build
@@ -77,6 +77,13 @@ else
endif
accelerator_targets = { 'CONFIG_KVM': kvm_targets }
+
+if cpu in ['aarch64']
+ accelerator_targets += {
+ 'CONFIG_HVF': ['aarch64-softmmu']
+ }
+endif
+
if cpu in ['x86', 'x86_64', 'arm', 'aarch64']
# i368 emulator provides xenpv machine type for multiple architectures
accelerator_targets += {
diff --git a/target/arm/hvf/meson.build b/target/arm/hvf/meson.build
new file mode 100644
index 0000000000..855e6cce5a
--- /dev/null
+++ b/target/arm/hvf/meson.build
@@ -0,0 +1,3 @@
+arm_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
+ 'hvf.c',
+))
diff --git a/target/arm/meson.build b/target/arm/meson.build
index 5bfaf43b50..48004bf0e6 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -57,5 +57,7 @@ arm_softmmu_ss.add(files(
'psci.c',
))
+subdir('hvf')
+
target_arch += {'arm': arm_ss}
target_softmmu_arch += {'arm': arm_softmmu_ss}
--
2.30.1 (Apple Git-130)
- [PATCH v7 04/19] hvf: Move hvf internal definitions into common header, (continued)
- [PATCH v7 04/19] hvf: Move hvf internal definitions into common header, Alexander Graf, 2021/05/16
- [PATCH v7 08/19] hvf: Use cpu_synchronize_state(), Alexander Graf, 2021/05/16
- [PATCH v7 09/19] hvf: Make synchronize functions static, Alexander Graf, 2021/05/16
- [PATCH v7 03/19] hvf: Move cpu functions into common directory, Alexander Graf, 2021/05/16
- [PATCH v7 10/19] hvf: Remove hvf-accel-ops.h, Alexander Graf, 2021/05/16
- [PATCH v7 12/19] hvf: Simplify post reset/init/loadvm hooks, Alexander Graf, 2021/05/16
- [PATCH v7 11/19] hvf: Introduce hvf vcpu struct, Alexander Graf, 2021/05/16
- [PATCH v7 14/19] arm/hvf: Add a WFI handler, Alexander Graf, 2021/05/16
- [PATCH v7 19/19] hvf: arm: Handle Windows 10 SMC call, Alexander Graf, 2021/05/16
- [PATCH v7 13/19] hvf: Add Apple Silicon support, Alexander Graf, 2021/05/16
- [PATCH v7 17/19] arm: Add Hypervisor.framework build target,
Alexander Graf <=
- [PATCH v7 18/19] arm: Enable Windows 10 trusted SMCCC boot call, Alexander Graf, 2021/05/16
- [PATCH v7 15/19] hvf: arm: Implement -cpu host, Alexander Graf, 2021/05/16
- [PATCH v7 16/19] hvf: arm: Implement PSCI handling, Alexander Graf, 2021/05/16
- Re: [PATCH v7 00/19] hvf: Implement Apple Silicon Support, no-reply, 2021/05/16