diff options
| author | Alexander Graf <agraf@csgraf.de> | 2021-09-16 17:54:02 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-21 16:28:26 +0100 |
| commit | 844a06bbe41d22b1ccd445e5351fb7429e49f0b7 (patch) | |
| tree | b3e4d4fdde087a1dea6e60c4154991a68c734da7 | |
| parent | 2c9c0bf9d1a3eb2e6d7411887ed1653254cf11a8 (diff) | |
| download | qemu-844a06bbe41d22b1ccd445e5351fb7429e49f0b7.zip qemu-844a06bbe41d22b1ccd445e5351fb7429e49f0b7.tar.gz qemu-844a06bbe41d22b1ccd445e5351fb7429e49f0b7.tar.bz2 | |
arm: Add Hypervisor.framework build target
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)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20210916155404.86958-9-agraf@csgraf.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | target/arm/hvf/meson.build | 3 | ||||
| -rw-r--r-- | target/arm/meson.build | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/meson.build b/meson.build index baa28d7..15ef4d3 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'] # i386 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 0000000..855e6cc --- /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 25a02bf..50f1522 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -60,5 +60,7 @@ arm_softmmu_ss.add(files( 'psci.c', )) +subdir('hvf') + target_arch += {'arm': arm_ss} target_softmmu_arch += {'arm': arm_softmmu_ss} |