Google Git
Sign in
qemu-android/qemu-android/d4de1007e84653d16f7bfff084b681c6b608f485
commit
d4de1007e84653d16f7bfff084b681c6b608f485
[log] [tgz]
author
Tao Wu <lepton@google.com>
Wed Nov 23 19:13:52 2016 -0800
committer
Tao Wu <lepton@google.com>
Wed Nov 23 19:18:38 2016 -0800
tree
3bb2fe2de1415c9c1b847a8c56c0f8b761b7c90c
parent
2f13e086b9a5ab14ce5e6dfe0364b291a7b29272 [diff]
Also merge user provided append args.

Otherwise it will overwrite append set by us and then emulator can't work.

Bug: 33107622

Change-Id: Ic0a23258005230b4f02c4f19f6752fd429777f7a
Signed-off-by: Tao Wu <lepton@google.com>
1 file changed
tree: 3bb2fe2de1415c9c1b847a8c56c0f8b761b7c90c
  1. android-qemu2-glue/
  2. audio/
  3. backends/
  4. block/
  5. bsd-user/
  6. contrib/
  7. crypto/
  8. default-configs/
  9. disas/
  10. docs/
  11. fpu/
  12. fsdev/
  13. gdb-xml/
  14. hw/
  15. include/
  16. io/
  17. libdecnumber/
  18. linux-headers/
  19. linux-user/
  20. migration/
  21. nbd/
  22. net/
  23. pc-bios/
  24. po/
  25. qapi/
  26. qga/
  27. qobject/
  28. qom/
  29. replay/
  30. roms/
  31. scripts/
  32. slirp/
  33. stubs/
  34. target-alpha/
  35. target-arm/
  36. target-cris/
  37. target-i386/
  38. target-lm32/
  39. target-m68k/
  40. target-microblaze/
  41. target-mips/
  42. target-moxie/
  43. target-openrisc/
  44. target-ppc/
  45. target-s390x/
  46. target-sh4/
  47. target-sparc/
  48. target-tilegx/
  49. target-tricore/
  50. target-unicore32/
  51. target-xtensa/
  52. tcg/
  53. tests/
  54. trace/
  55. ui/
  56. util/
  57. dtc
  58. pixman
  59. .dir-locals.el
  60. .exrc
  61. .gitignore
  62. .gitmodules
  63. .mailmap
  64. .travis.yml
  65. accel.c
  66. aio-posix.c
  67. aio-win32.c
  68. arch_init.c
  69. async.c
  70. balloon.c
  71. block.c
  72. blockdev-nbd.c
  73. blockdev.c
  74. blockjob.c
  75. bootdevice.c
  76. bt-host.c
  77. bt-vhci.c
  78. Changelog
  79. CODING_STYLE
  80. configure
  81. COPYING
  82. COPYING.LIB
  83. cpu-exec-common.c
  84. cpu-exec.c
  85. cpus.c
  86. cputlb.c
  87. device-hotplug.c
  88. device_tree.c
  89. disas.c
  90. dma-helpers.c
  91. dump.c
  92. exec.c
  93. gdbstub.c
  94. HACKING
  95. hax-stub.c
  96. hmp-commands-info.hx
  97. hmp-commands.hx
  98. hmp.c
  99. hmp.h
  100. iohandler.c
  101. ioport.c
  102. iothread.c
  103. kvm-all.c
  104. kvm-stub.c
  105. LICENSE
  106. main-loop.c
  107. MAINTAINERS
  108. Makefile
  109. Makefile.objs
  110. Makefile.target
  111. memory.c
  112. memory_mapping.c
  113. module-common.c
  114. monitor.c
  115. numa.c
  116. os-posix.c
  117. os-win32.c
  118. page_cache.c
  119. qapi-schema.json
  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-nbd.c
  132. qemu-nbd.texi
  133. qemu-option-trace.texi
  134. qemu-options-wrapper.h
  135. qemu-options.def
  136. qemu-options.h
  137. qemu-options.hx
  138. qemu-seccomp.c
  139. qemu-tech.texi
  140. qemu-timer.c
  141. qemu.nsi
  142. qemu.sasl
  143. qmp-commands.hx
  144. qmp.c
  145. qtest.c
  146. README
  147. rules.mak
  148. softmmu_template.h
  149. spice-qemu-char.c
  150. tcg-runtime.c
  151. tci.c
  152. thread-pool.c
  153. thunk.c
  154. tpm.c
  155. trace-events
  156. translate-all.c
  157. translate-all.h
  158. translate-common.c
  159. user-exec.c
  160. VERSION
  161. version.rc
  162. vl.c
  163. xen-common-stub.c
  164. xen-common.c
  165. xen-hvm-stub.c
  166. xen-hvm.c
  167. xen-mapcache.c