Google Git
Sign in
qemu-android/qemu-android/e2848a78b0a6715f94623bdf43ef74d3d08cfe4d
commit
e2848a78b0a6715f94623bdf43ef74d3d08cfe4d
[log]
author
Anthony Liguori <aliguori@us.ibm.com>
Fri Jan 11 08:36:52 2013 -0600
committer
Anthony Liguori <aliguori@us.ibm.com>
Fri Jan 11 08:43:08 2013 -0600
tree
6c9f6a0ee2ee6d4ba57795e8c13a1cd7cd5ddd97
parent
80ec24328607937690d0d620b99e8c24ab29e8f5 [diff]
parent
7e973bb2e17f929f47376a3872f7ccdff25a51ab [diff]
Merge remote-tracking branch 'kraxel/q35.1' into staging

* kraxel/q35.1:
  Makefile: install the "acpi-dsdt.aml" and "q35-acpi-dsdt.aml" blobs too
  pc: rename machine types
  q35: document chipset devices
  q35: add ich9 intel hda controller

Conflicts:
	hw/intel-hda.c

aliguori: resolve conflict with static const change from Andreas.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
tree: 6c9f6a0ee2ee6d4ba57795e8c13a1cd7cd5ddd97
  1. audio/
  2. backends/
  3. block/
  4. bsd-user/
  5. default-configs/
  6. disas/
  7. docs/
  8. fpu/
  9. fsdev/
  10. gdb-xml/
  11. hw/
  12. include/
  13. ldscripts/
  14. libcacard/
  15. linux-headers/
  16. linux-user/
  17. net/
  18. pc-bios/
  19. qapi/
  20. qga/
  21. QMP/
  22. qom/
  23. roms/
  24. scripts/
  25. slirp/
  26. stubs/
  27. sysconfigs/
  28. target-alpha/
  29. target-arm/
  30. target-cris/
  31. target-i386/
  32. target-lm32/
  33. target-m68k/
  34. target-microblaze/
  35. target-mips/
  36. target-openrisc/
  37. target-ppc/
  38. target-s390x/
  39. target-sh4/
  40. target-sparc/
  41. target-unicore32/
  42. target-xtensa/
  43. tcg/
  44. tests/
  45. trace/
  46. ui/
  47. pixman
  48. .exrc
  49. .gitignore
  50. .gitmodules
  51. .mailmap
  52. acl.c
  53. aes.c
  54. aio-posix.c
  55. aio-win32.c
  56. arch_init.c
  57. async.c
  58. balloon.c
  59. bitmap.c
  60. bitops.c
  61. block-migration.c
  62. block.c
  63. blockdev-nbd.c
  64. blockdev.c
  65. blockjob.c
  66. bt-host.c
  67. bt-vhci.c
  68. cache-utils.c
  69. Changelog
  70. cmd.c
  71. cmd.h
  72. CODING_STYLE
  73. compatfd.c
  74. configure
  75. COPYING
  76. COPYING.LIB
  77. coroutine-gthread.c
  78. coroutine-sigaltstack.c
  79. coroutine-ucontext.c
  80. coroutine-win32.c
  81. cpu-exec.c
  82. cpus.c
  83. cputlb.c
  84. cutils.c
  85. device_tree.c
  86. disas.c
  87. dma-helpers.c
  88. dump-stub.c
  89. dump.c
  90. envlist.c
  91. error.c
  92. event_notifier-posix.c
  93. event_notifier-win32.c
  94. exec.c
  95. gdbstub.c
  96. HACKING
  97. hmp-commands.hx
  98. hmp.c
  99. hmp.h
  100. host-utils.c
  101. iohandler.c
  102. ioport.c
  103. iov.c
  104. json-lexer.c
  105. json-parser.c
  106. json-streamer.c
  107. kvm-all.c
  108. kvm-stub.c
  109. LICENSE
  110. main-loop.c
  111. MAINTAINERS
  112. Makefile
  113. Makefile.objs
  114. Makefile.target
  115. memory.c
  116. memory_mapping-stub.c
  117. memory_mapping.c
  118. migration-exec.c
  119. migration-fd.c
  120. migration-tcp.c
  121. migration-unix.c
  122. migration.c
  123. module.c
  124. monitor.c
  125. nbd.c
  126. notify.c
  127. os-posix.c
  128. os-win32.c
  129. osdep.c
  130. oslib-posix.c
  131. oslib-win32.c
  132. page_cache.c
  133. path.c
  134. pci-ids.txt
  135. qapi-schema-test.json
  136. qapi-schema.json
  137. qbool.c
  138. qdict-test-data.txt
  139. qdict.c
  140. qemu-bridge-helper.c
  141. qemu-char.c
  142. qemu-config.c
  143. qemu-coroutine-io.c
  144. qemu-coroutine-lock.c
  145. qemu-coroutine-sleep.c
  146. qemu-coroutine.c
  147. qemu-doc.texi
  148. qemu-error.c
  149. qemu-img-cmds.hx
  150. qemu-img.c
  151. qemu-img.texi
  152. qemu-io.c
  153. qemu-log.c
  154. qemu-nbd.c
  155. qemu-nbd.texi
  156. qemu-option.c
  157. qemu-options-wrapper.h
  158. qemu-options.h
  159. qemu-options.hx
  160. qemu-progress.c
  161. qemu-seccomp.c
  162. qemu-sockets.c
  163. qemu-tech.texi
  164. qemu-thread-posix.c
  165. qemu-thread-win32.c
  166. qemu-timer-common.c
  167. qemu-timer.c
  168. qemu-tool.c
  169. qemu-user.c
  170. qemu.sasl
  171. qerror.c
  172. qfloat.c
  173. qint.c
  174. qjson.c
  175. qlist.c
  176. qmp-commands.hx
  177. qmp.c
  178. qstring.c
  179. qtest.c
  180. readline.c
  181. README
  182. rules.mak
  183. savevm.c
  184. spice-qemu-char.c
  185. tcg-runtime.c
  186. tci.c
  187. thread-pool.c
  188. thunk.c
  189. TODO
  190. trace-events
  191. trace.h
  192. translate-all.c
  193. translate-all.h
  194. uri.c
  195. user-exec.c
  196. VERSION
  197. version.rc
  198. vl.c
  199. xen-all.c
  200. xen-mapcache.c
  201. xen-stub.c