diff options
| author | Kirsten Lee <kirstenlee@google.com> | 2015-07-28 16:29:25 -0700 |
|---|---|---|
| committer | Kirsten Lee <kirstenlee@google.com> | 2015-07-28 16:38:29 -0700 |
| commit | f9ee3bc0c875dbf35c02521d5fa20f7894579ee1 (patch) | |
| tree | 76262cfd4f603735c28166d7baf21697fb436664 | |
| parent | f12249def772d4cc5e176b0534a5a5e9d2eab79b (diff) | |
| download | qemu-f9ee3bc0c875dbf35c02521d5fa20f7894579ee1.tar.gz | |
Resolving a kernel-panic in windows arm executables.
A previous patch removed a check that disabled looking for 64-bit
emulator executables on windows - this works fine for x86/x86_64
executables but results in a kernel panic for arm executables.
This patch restores that disabling check for arm images
Change-Id: I08c16dee2d156cd4a217924af75bcd74871bb402
| -rw-r--r-- | android/main-emulator.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/android/main-emulator.c b/android/main-emulator.c index ddcf3065bf..595928c868 100644 --- a/android/main-emulator.c +++ b/android/main-emulator.c @@ -468,6 +468,13 @@ getTargetEmulatorPath(const char* progDir, char* ranchu_result; bool search_for_64bit_emulator = !force_32bit && android_getHostBitness() == 64; +#ifdef _WIN32 + // Using emulator64-arm.exe results in a kernel panic while + // x86/x86_64 emulator executables don't have this issue + if (!strcmp(avdArch, "arm")) { + search_for_64bit_emulator = false; + } +#endif const char* emulatorSuffix; |