Google Git
Sign in
qemu-android / emulator-unstable-refactoring / 7c07e4eacaa12e259866aedd0005cf906eb750d7
commit7c07e4eacaa12e259866aedd0005cf906eb750d7[log] [tgz]
authorDavid 'Digit' Turner <digit@google.com>Sat Jun 14 00:07:04 2014 +0200
committerDavid 'Digit' Turner <digit@google.com>Sat Jun 14 00:07:04 2014 +0200
tree3292252e9bf25da77984940c654183879a8c9eb0
parent3f3fb0c467e47766955cc3e67d1f5f30137429b2 [diff]
Fix CPU architecture check for x86_64.

Recently, the value of ro.build.cpu.abi for x86_64 system images
was changed from the invalid 'x86' to the correct 'x86_64'.

Unfortunately, this triggered a bug in vl-android.c where the value
is checked. This patch modifies the code to accept 'x86_64' as a
valid ABI value in emulator-x86 and emulator64-x86, and simplifies
the logic to make it easier to add support for more architectures
in the future.

BUG=none

Change-Id: I35001536e8bbd156b809fce1cceacefd47c5f845
1 file changed
tree: 3292252e9bf25da77984940c654183879a8c9eb0
  1. android/
  2. audio/
  3. backends/
  4. block/
  5. disas/
  6. distrib/
  7. docs/
  8. fpu/
  9. gdb-xml/
  10. hw/
  11. images/
  12. include/
  13. net/
  14. pc-bios/
  15. proxy/
  16. qapi-auto-generated/
  17. qobject/
  18. qom/
  19. scripts/
  20. slirp/
  21. slirp-android/
  22. target-arm/
  23. target-i386/
  24. target-mips/
  25. tcg/
  26. telephony/
  27. ui/
  28. util/
  29. .gitignore
  30. aio-android.c
  31. aio.c
  32. android-configure.sh
  33. android-rebuild.sh
  34. Android.mk
  35. arch_init.c
  36. async.c
  37. block.c
  38. blockdev.c
  39. buffered_file.c
  40. buffered_file.h
  41. build.gradle
  42. Changelog
  43. CHANGES.TXT
  44. CleanSpec.mk
  45. COPYING
  46. COPYING.LIB
  47. cpu-exec.c
  48. cpus.c
  49. cputlb.c
  50. disas.c
  51. dma-helpers.c
  52. exec.c
  53. feature_to_c.sh
  54. gdbstub.c
  55. gen-charmap.py
  56. gen-skin.py
  57. hxtool
  58. INSTALL
  59. iohandler.c
  60. ioport.c
  61. kvm-all.c
  62. kvm-android.c
  63. LICENSE
  64. log-rotate-android.c
  65. main-loop.c
  66. Makefile
  67. Makefile.android
  68. Makefile.common
  69. Makefile.target
  70. Makefile.tests
  71. memory-android.c
  72. migration-dummy-android.c
  73. MODULE_LICENSE_GPL
  74. monitor-android.c
  75. NOTICE
  76. offset_layout.py
  77. os-posix.c
  78. os-win32.c
  79. posix-aio-compat.c
  80. qapi-schema.json
  81. qemu-char.c
  82. qemu-log.c
  83. qemu-options.h
  84. qemu-options.hx
  85. qemu-timer.c
  86. README
  87. savevm.c
  88. sys-tree.h
  89. tap-win32.c
  90. tcg-runtime.c
  91. translate-all.c
  92. translate-all.h
  93. vl-android.c