diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 18:18:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-08 18:18:43 +0000 |
| commit | 83a6203a8b624ea1287b18775d99e304a2fee89d (patch) | |
| tree | 5a40bbb52413bb3fc629dbfe0fb57cbd09d016a7 | |
| parent | 89b0a4ebe53d06af8415e923a65e78e3dcaa0bbd (diff) | |
| parent | 3a5fbf56d85bf6b872f5bc43c316d4c9fac1258b (diff) | |
| download | qemu-snap-temp-L20700000954222801.tar.gz | |
Merge "Merge cherrypicks of [2058888] into emu-31-release." into emu-31-releasesnap-temp-L20700000954222801
| -rwxr-xr-x | android-qemu2-glue/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android-qemu2-glue/main.cpp b/android-qemu2-glue/main.cpp index e1a138ce55..c98b04db3f 100755 --- a/android-qemu2-glue/main.cpp +++ b/android-qemu2-glue/main.cpp @@ -1963,9 +1963,12 @@ extern "C" int main(int argc, char** argv) { handleCpuAcceleration(opts, avd, &accel_mode, &accel_status); if (accel_ok) { #ifdef __APPLE__ - if (avd && avdInfo_getApiLevel(avd) >= 28 - && !strcmp(avdInfo_getTargetAbi(avd), "arm64-v8a")) + if (avd && avdInfo_getApiLevel(avd) >= 24 + && !strcmp(avdInfo_getTargetAbi(avd), "arm64-v8a")) { args.add("-enable-hvf"); + } else { + dwarning("hvf is not enabled on this aarch64 host."); + } #else args.add("-enable-kvm"); #endif |