Google Git
Sign in
android / platform / external / qemu / refs/heads/aosp-emu-30-release
commit791783c6e74c936a8fcd231ad36219385723bb8a[log] [tgz]
authorTreehugger Robot <treehugger-gerrit@google.com>Fri Jun 26 20:09:28 2020 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>Fri Jun 26 20:09:28 2020 +0000
tree7426ab18a6bd2a0f25a048ac559477bea75473d4
parent994dbc077a57203749762e81f1ae60766e17946d [diff]
parent99fb5039b686f67cb065be80e3564e26677fd008 [diff]
Merge "Enable kvm-clock on guest kernels equal to or above 5.4" into emu-master-dev
tree: 7426ab18a6bd2a0f25a048ac559477bea75473d4
  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. LICENSES/
  23. linux-headers/
  24. linux-user/
  25. migration/
  26. nbd/
  27. net/
  28. pc-bios/
  29. po/
  30. qapi/
  31. qemu2-auto-generated/
  32. qga/
  33. qobject/
  34. qom/
  35. replay/
  36. roms/
  37. scripts/
  38. scsi/
  39. slirp/
  40. stubs/
  41. target/
  42. tcg/
  43. tests/
  44. trace/
  45. ui/
  46. util/
  47. capstone
  48. dtc
  49. .clang-tidy
  50. .dir-locals.el
  51. .editorconfig
  52. .exrc
  53. .gdbinit
  54. .gitignore
  55. .gitmodules
  56. .gitpublish
  57. .mailmap
  58. .shippable.yml
  59. .travis.yml
  60. android-info.txt
  61. arch_init.c
  62. balloon.c
  63. block.c
  64. blockdev-nbd.c
  65. blockdev.c
  66. blockjob.c
  67. bootdevice.c
  68. bt-host.c
  69. bt-vhci.c
  70. build.gradle
  71. Changelog
  72. cmake-format.json
  73. cmake-main.darwin-x86_64.inc
  74. cmake-main.linux-aarch64.inc
  75. cmake-main.linux-x86_64.inc
  76. cmake-main.windows-x86.inc
  77. cmake-main.windows-x86_64.inc
  78. cmake-main.windows_msvc-x86_64.inc
  79. CMakeLists.txt
  80. CODING_STYLE
  81. configure
  82. COPYING
  83. COPYING.LIB
  84. COPYING.PYTHON
  85. cpus-common.c
  86. cpus.c
  87. device-hotplug.c
  88. device_tree.c
  89. disas.c
  90. dma-helpers.c
  91. dummy.c
  92. dump.c
  93. exec.c
  94. gdbstub.c
  95. GNUmakefile
  96. HACKING
  97. hmp-commands-info.hx
  98. hmp-commands.hx
  99. hmp.c
  100. hmp.h
  101. hvf-stub.c
  102. ioport.c
  103. iothread.c
  104. LICENSE
  105. mac.source.properties
  106. MAINTAINERS
  107. Makefile
  108. Makefile.objs
  109. Makefile.target
  110. memory.c
  111. memory_ldst.inc.c
  112. memory_mapping.c
  113. module-common.c
  114. MODULE_LICENSE_GPL
  115. monitor.c
  116. NOTICE
  117. numa.c
  118. os-posix.c
  119. os-win32.c
  120. qdev-monitor.c
  121. qdict-test-data.txt
  122. qemu-bridge-helper.c
  123. qemu-char.c
  124. qemu-doc.texi
  125. qemu-ga.texi
  126. qemu-img-cmds.hx
  127. qemu-img.c
  128. qemu-img.texi
  129. qemu-io-cmds.c
  130. qemu-io.c
  131. qemu-keymap.c
  132. qemu-nbd.c
  133. qemu-nbd.texi
  134. qemu-option-trace.texi
  135. qemu-options-wrapper.h
  136. qemu-options.def
  137. qemu-options.h
  138. qemu-options.hx
  139. qemu-seccomp.c
  140. qemu-tech.texi
  141. qemu-test.cmake
  142. qemu-version.h.in
  143. qemu.nsi
  144. qemu.sasl
  145. QEMU_VERSION
  146. qmp.c
  147. qtest.c
  148. README
  149. README.md
  150. replication.c
  151. replication.h
  152. rules.mak
  153. source.properties
  154. thunk.c
  155. tpm.c
  156. trace-events
  157. version.rc
  158. vl.c
  159. whpx-stub.c
  160. 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.