Google Git
Sign in
android / platform / external / qemu / 0073de7b944c9f122097f6eeb7c6c4a225d34dd7
commit0073de7b944c9f122097f6eeb7c6c4a225d34dd7[log] [tgz]
authorLingfeng Yang <lfy@google.com>Mon Jan 13 10:02:26 2020 -0800
committerLingfeng Yang <lfy@google.com>Mon Jan 13 10:02:26 2020 -0800
tree3fb9f297f640b2848880658738e24abc0db29ddf
parentabc6d8ad7d4164c08bff5b30a11f553f2a575bc1 [diff]
Bump emulator to 29.3.6

Change-Id: Ic2f3964d51db94755501ae792813b3a1a1e7f0fe
3 files changed
tree: 3fb9f297f640b2848880658738e24abc0db29ddf
  1. .vscode/
  2. accel/
  3. android/
  4. android-qemu2-glue/
  5. audio/
  6. backends/
  7. block/
  8. bsd-user/
  9. chardev/
  10. contrib/
  11. crypto/
  12. default-configs/
  13. disas/
  14. docs/
  15. fpu/
  16. fsdev/
  17. gdb-xml/
  18. hw/
  19. include/
  20. io/
  21. libdecnumber/
  22. linux-headers/
  23. linux-user/
  24. migration/
  25. nbd/
  26. net/
  27. pc-bios/
  28. po/
  29. qapi/
  30. qemu2-auto-generated/
  31. qga/
  32. qobject/
  33. qom/
  34. replay/
  35. roms/
  36. scripts/
  37. scsi/
  38. slirp/
  39. stubs/
  40. target/
  41. tcg/
  42. tests/
  43. trace/
  44. ui/
  45. util/
  46. capstone
  47. dtc
  48. .clang-tidy
  49. .dir-locals.el
  50. .editorconfig
  51. .exrc
  52. .gdbinit
  53. .gitignore
  54. .gitmodules
  55. .gitpublish
  56. .mailmap
  57. .shippable.yml
  58. .travis.yml
  59. android-info.txt
  60. arch_init.c
  61. balloon.c
  62. block.c
  63. blockdev-nbd.c
  64. blockdev.c
  65. blockjob.c
  66. bootdevice.c
  67. bt-host.c
  68. bt-vhci.c
  69. build.gradle
  70. Changelog
  71. cmake-format.json
  72. cmake-main.darwin-x86_64.inc
  73. cmake-main.linux-x86_64.inc
  74. cmake-main.windows-x86.inc
  75. cmake-main.windows-x86_64.inc
  76. cmake-main.windows_msvc-x86_64.inc
  77. CMakeLists.txt
  78. CODING_STYLE
  79. configure
  80. COPYING
  81. COPYING.LIB
  82. COPYING.PYTHON
  83. cpus-common.c
  84. cpus.c
  85. device-hotplug.c
  86. device_tree.c
  87. disas.c
  88. dma-helpers.c
  89. dummy.c
  90. dump.c
  91. exec.c
  92. gdbstub.c
  93. GNUmakefile
  94. HACKING
  95. hmp-commands-info.hx
  96. hmp-commands.hx
  97. hmp.c
  98. hmp.h
  99. hvf-stub.c
  100. ioport.c
  101. iothread.c
  102. LICENSE
  103. mac.source.properties
  104. MAINTAINERS
  105. Makefile
  106. Makefile.objs
  107. Makefile.target
  108. memory.c
  109. memory_ldst.inc.c
  110. memory_mapping.c
  111. module-common.c
  112. MODULE_LICENSE_GPL
  113. monitor.c
  114. NOTICE
  115. numa.c
  116. os-posix.c
  117. os-win32.c
  118. qdev-monitor.c
  119. qdict-test-data.txt
  120. qemu-bridge-helper.c
  121. qemu-char.c
  122. qemu-doc.texi
  123. qemu-ga.texi
  124. qemu-img-cmds.hx
  125. qemu-img.c
  126. qemu-img.texi
  127. qemu-io-cmds.c
  128. qemu-io.c
  129. qemu-keymap.c
  130. qemu-nbd.c
  131. qemu-nbd.texi
  132. qemu-option-trace.texi
  133. qemu-options-wrapper.h
  134. qemu-options.def
  135. qemu-options.h
  136. qemu-options.hx
  137. qemu-seccomp.c
  138. qemu-tech.texi
  139. qemu-test.cmake
  140. qemu-version.h.in
  141. qemu.nsi
  142. qemu.sasl
  143. QEMU_VERSION
  144. qmp.c
  145. qtest.c
  146. README
  147. README.md
  148. replication.c
  149. replication.h
  150. rules.mak
  151. source.properties
  152. thunk.c
  153. tpm.c
  154. trace-events
  155. version.rc
  156. vl.c
  157. whpx-stub.c
  158. win.source.properties
README.md

Welcome to the Android Emulator

This document gives you some background on the emulator and outlines how you can start hacking and contributing to the emulator!

Just get me started with development!

Make sure to install Android Studio and the associated SDKs. Do not forget to install the official emulator and create a few android virtual devices. Next follow the instructions for the platform you would like to work on:

We use the Repo tool to manage working accross multiple branches.

About the Emulator

The Android Emulator simulates Android devices on your computer so that you can test your application on a variety of devices and Android API levels without needing to have each physical device.

The emulator provides almost all of the capabilities of a real Android device. You can simulate incoming phone calls and text messages, specify the location of the device, simulate different network speeds, simulate rotation and other hardware sensors, access the Google Play Store, and much more.

Testing your app on the emulator is in some ways faster and easier than doing so on a physical device. For example, you can transfer data faster to the emulator than to a device connected over USB.

The emulator comes with predefined configurations for various Android phone, tablet, Wear OS, and Android TV devices.

Recommended Reading

The following is a list of concepts that are important. Please read these links and any other links you can find. If you find a link that you think does a better job at explaining the concept, please add it here:

QEMU is an open source competitor to VMware Workstation, VirtualBox, HyperV. It is focused on Linux server virtualization on Linux servers. While QEMU does support booting other OS’s, we don’t use that functionality since Android is Linux.

The Android Emulator is downstream from the QEMU emulator. It adds support for booting Android devices, emulates typical Android hardware (OpenGL, GPS, GSM, Sensors) and a GUI interface. The android emulator extends qemu in various ways.

For an overview of Qemu see:

The QEMU emulator leverages technologies like hardware Hypervisors KVM (Linux) and HAXM (Windows/Mac)

https://en.wikipedia.org/wiki/Hypervisor https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine

The QEMU emulator supports both guest images that require full virtualization and guest images that require paravirtualization technologies like virtio

The emulator passes a device tree blob to a guest kernel to describe the guest hardware

When running a non-x86 image on an x86 host, QEMU will JIT the non-x86 code into x86 code. See this lectutre for more. The MMU (page table hardware) is emulated in software, which is unfortunately slow.

You will need to build Android kernels and system images that the emulator will run. The easiest way to obtain these is to make use of the publicly released images. You can find more details here.

Building the Emulator

The emulator uses Cmake as a meta build generator, and all the necessary compilers and toolchains are included in the repository. Make sure you have read the section above as the requirements to succesfully build vary slightly from platform to platform.

In general you can run the following script:

./android/rebuild.sh

For incremental builds you can use ninja. For example

ninja -C objs

Contributing code

The emulator uses a coding style derived from the Chromium style. We use the repo tool to submit pathces. The usual workflow is roughly as follows:

    repy sync # Pulls in all the changes accross all branches.
    repo start my_awesome_feature

This will create a git branch called my_awesome_feature. You can now work on your patch.

Once you have written a patch you can send it out for code review. We use gerrit for code reviews.

Use the repo tool to upload or update a CL:

    repo upload --cbr --re=”blah@google.com,foo@google.com,bar@google.com”
  • “--cbr” means “upload the current branch”,
  • “--re” supplies the initial reviewers list

Add “-t” switch to use the current git branch as a review topic (topic groups CLs together and only allows them to be submitted when all got +2/+verified)

The repo tool will provide you with a url where you can find your change.

Code Reviews

Make sure to check the CL against our coding style: coding style. Coding style isn’t frozen: just edit it in our repository and create a code review to propose a change.

Some good articles on code reviewing, especially when it comes to google:

Below are some short notes relevant to the emulator.

Keep in mind that all of the code reviews are open source and visible to everyone!. In other words, be nice and and provide actionable constructive feedback.

  • C++ over C for all new code. Always.

  • After uploading a CL for review, author should “+1” it when they think it’s ready for reviewing. A CL without author’s “+1” is a “work in progress” and other reviewers may ignore it..

  • Prefer not to send a WIP CL to reviewers and only add them when it’s in a reviewable state. If you realized that you added reviewers too soon, just remove them - “x” button in the browser UI for each reviewer actually works.

  • Avoid large CLs. There are always exceptions, use your best judgement to improve code clarity and to help other maintainers in the future.

    Split the changes into smaller isolated chunks and submit those as a single topic If you touch multiple components, that’s a good way to split the CL.

    Changes into any QEMU files must be in their own CL - otherwise rebasing into the new version becomes 10x more painful.

  • “-2” is sticky, it remains there until the very same reviewer removes it. If you “-2”-ed someone, it’s always a good thing to communicate to them about the follow-up

  • Abandon the CLs you don’t need anymore

  • Tests: when reviewing the code, make sure there’s a test or a really good reason for its absence

Merging downstream Qemu

Merging changes from the qemu branch should be done on the emu-master-qemu branch. You will need to this on a linux machine as qemu development happens in a linux environment. Once you have obtained this branch you can add the remote qemu repository as follows:

cd emu-master-qemu/external/qemu
git remote add qemu https://git.qemu.org/git/qemu.git
git fetch qemu

Now you can start merging in changes:

git merge master

Be smart, merge only a few commits at a time

Next you should try to build qemu standalone:

    ./android/scripts/unix/build-qemu-android.sh  --verbose --verbose --build-dir=$HOME/qemu-build  &&
    cd $HOME/qemu-build/build-linux-x86_64 &&
    source env.sh &&
    cd qemu-android &&
    make

Now you are ready for building, testing, and merging the next set. You could have a look at this script to automate this slightly.