Merge branch 'upstream-merge' into next

* upstream-merge: (389 commits)
  Bump version to 1.0-rc0
  Revert "virtio: Add PCI memory BAR in addition to PIO BAR"
  tcg: Fix whitespace in tcg-op.h.
  tcg: Fix regression in tcg_gen_deposit_i64.
  pcnet: Add link state support
  pcnet-pci: Fix PIO word access to PROM
  pcnet: Move BCR defines to header
  Sort the help info shown in monitor at runtime
  event_notifier: move to top-level directory
  Move filedescriptor parsing code from net.c into qemu_parse_fd()
  configure: Suppress messages from pkg_config probe for check
  virtio: Add PCI memory BAR in addition to PIO BAR
  usb-uhci: Use PCI DMA stub functions
  usb-ehci: Use PCI DMA stub functions
  PCI IDE: Use PCI DMA stub functions
  intel-hda: Use PCI DMA stub functions
  pcnet-pci: Use PCI DMA stub functions
  lsi53c895a: Use PCI DMA stub functions
  e1000: Use PCI DMA stub functions
  es1370: Use PCI DMA stub functions
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>
tree: 605d362bd74d2354b272cdeda968b432f81449b3
  1. .gitignore
  2. .gitmodules
  3. CODING_STYLE
  4. COPYING
  5. COPYING.LIB
  6. Changelog
  7. HACKING
  8. LICENSE
  9. MAINTAINERS
  10. Makefile
  11. Makefile.dis
  12. Makefile.hw
  13. Makefile.objs
  14. Makefile.target
  15. Makefile.user
  16. QMP/
  17. README
  18. TODO
  19. VERSION
  20. a.out.h
  21. acl.c
  22. acl.h
  23. aes.c
  24. aes.h
  25. aio.c
  26. alpha-dis.c
  27. alpha.ld
  28. arch_init.c
  29. arch_init.h
  30. arm-dis.c
  31. arm-semi.c
  32. arm.ld
  33. async.c
  34. audio/
  35. balloon.c
  36. balloon.h
  37. bitmap.c
  38. bitmap.h
  39. bitops.c
  40. bitops.h
  41. block-migration.c
  42. block-migration.h
  43. block.c
  44. block.h
  45. block/
  46. block_int.h
  47. blockdev.c
  48. blockdev.h
  49. bsd-user/
  50. bswap.h
  51. bt-host.c
  52. bt-host.h
  53. bt-vhci.c
  54. buffered_file.c
  55. buffered_file.h
  56. cache-utils.c
  57. cache-utils.h
  58. check-qdict.c
  59. check-qfloat.c
  60. check-qint.c
  61. check-qjson.c
  62. check-qlist.c
  63. check-qstring.c
  64. cmd.c
  65. cmd.h
  66. compatfd.c
  67. compatfd.h
  68. compiler.h
  69. config.h
  70. configure
  71. console.c
  72. console.h
  73. coroutine-gthread.c
  74. coroutine-ucontext.c
  75. coroutine-win32.c
  76. cpu-all.h
  77. cpu-common.h
  78. cpu-defs.h
  79. cpu-exec.c
  80. cpus.c
  81. cpus.h
  82. cris-dis.c
  83. cursor.c
  84. cursor_hidden.xpm
  85. cursor_left_ptr.xpm
  86. cutils.c
  87. darwin-user/
  88. def-helper.h
  89. default-configs/
  90. device_tree.c
  91. device_tree.h
  92. dis-asm.h
  93. disas.c
  94. disas.h
  95. dma-helpers.c
  96. dma.h
  97. docs/
  98. dyngen-exec.h
  99. elf.h
  100. envlist.c
  101. envlist.h
  102. error.c
  103. error.h
  104. error_int.h
  105. event_notifier.c
  106. event_notifier.h
  107. exec-all.h
  108. exec-memory.h
  109. exec.c
  110. fpu/
  111. fsdev/
  112. gdb-xml/
  113. gdbstub.c
  114. gdbstub.h
  115. gen-icount.h
  116. hmp-commands.hx
  117. hmp.c
  118. hmp.h
  119. host-utils.c
  120. host-utils.h
  121. hppa-dis.c
  122. hppa.ld
  123. hw/
  124. i386-dis.c
  125. i386.ld
  126. ia64-dis.c
  127. ia64.ld
  128. input.c
  129. iohandler.c
  130. ioport-user.c
  131. ioport.c
  132. ioport.h
  133. iorange.h
  134. iov.c
  135. iov.h
  136. json-lexer.c
  137. json-lexer.h
  138. json-parser.c
  139. json-parser.h
  140. json-streamer.c
  141. json-streamer.h
  142. kvm-all.c
  143. kvm-stub.c
  144. kvm-tpr-opt.c
  145. kvm.h
  146. kvm/
  147. libcacard/
  148. libfdt_env.h
  149. linux-aio.c
  150. linux-headers/
  151. linux-user/
  152. m68k-dis.c
  153. m68k-semi.c
  154. m68k.ld
  155. main-loop.c
  156. main-loop.h
  157. memory.c
  158. memory.h
  159. microblaze-dis.c
  160. migration-exec.c
  161. migration-fd.c
  162. migration-tcp.c
  163. migration-unix.c
  164. migration.c
  165. migration.h
  166. mips-dis.c
  167. mips.ld
  168. module.c
  169. module.h
  170. monitor.c
  171. monitor.h
  172. nbd.c
  173. nbd.h
  174. net.c
  175. net.h
  176. net/
  177. notify.c
  178. notify.h
  179. os-posix.c
  180. os-win32.c
  181. osdep.c
  182. osdep.h
  183. oslib-posix.c
  184. oslib-win32.c
  185. path.c
  186. pc-bios/
  187. pci-ids.txt
  188. pflib.c
  189. pflib.h
  190. poison.h
  191. posix-aio-compat.c
  192. ppc-dis.c
  193. ppc.ld
  194. ppc64.ld
  195. qapi-schema-guest.json
  196. qapi-schema-test.json
  197. qapi-schema.json
  198. qapi/
  199. qbool.c
  200. qbool.h
  201. qdict-test-data.txt
  202. qdict.c
  203. qdict.h
  204. qemu-aio.h
  205. qemu-barrier.h
  206. qemu-char.c
  207. qemu-char.h
  208. qemu-common.h
  209. qemu-config.c
  210. qemu-config.h
  211. qemu-coroutine-int.h
  212. qemu-coroutine-lock.c
  213. qemu-coroutine.c
  214. qemu-coroutine.h
  215. qemu-doc.texi
  216. qemu-error.c
  217. qemu-error.h
  218. qemu-ga.c
  219. qemu-img-cmds.hx
  220. qemu-img.c
  221. qemu-img.texi
  222. qemu-io.c
  223. qemu-kvm-x86.c
  224. qemu-kvm.c
  225. qemu-kvm.h
  226. qemu-lock.h
  227. qemu-log.h
  228. qemu-nbd.c
  229. qemu-nbd.texi
  230. qemu-objects.h
  231. qemu-option.c
  232. qemu-option.h
  233. qemu-options.h
  234. qemu-options.hx
  235. qemu-os-posix.h
  236. qemu-os-win32.h
  237. qemu-progress.c
  238. qemu-queue.h
  239. qemu-sockets.c
  240. qemu-tech.texi
  241. qemu-thread-posix.c
  242. qemu-thread-posix.h
  243. qemu-thread-win32.c
  244. qemu-thread-win32.h
  245. qemu-thread.h
  246. qemu-timer-common.c
  247. qemu-timer.c
  248. qemu-timer.h
  249. qemu-tls.h
  250. qemu-tool.c
  251. qemu-x509.h
  252. qemu.sasl
  253. qemu_socket.h
  254. qerror.c
  255. qerror.h
  256. qfloat.c
  257. qfloat.h
  258. qga/
  259. qint.c
  260. qint.h
  261. qjson.c
  262. qjson.h
  263. qlist.c
  264. qlist.h
  265. qmp-commands.hx
  266. qmp.c
  267. qobject.h
  268. qstring.c
  269. qstring.h
  270. range.h
  271. readline.c
  272. readline.h
  273. roms/
  274. rules.mak
  275. s390-dis.c
  276. s390.ld
  277. savevm.c
  278. scripts/
  279. sh4-dis.c
  280. slirp/
  281. softmmu-semi.h
  282. softmmu_defs.h
  283. softmmu_exec.h
  284. softmmu_header.h
  285. softmmu_template.h
  286. sparc-dis.c
  287. sparc.ld
  288. sparc64.ld
  289. spice-qemu-char.c
  290. sysconfigs/
  291. sysemu.h
  292. target-alpha/
  293. target-arm/
  294. target-cris/
  295. target-i386/
  296. target-lm32/
  297. target-m68k/
  298. target-microblaze/
  299. target-mips/
  300. target-ppc/
  301. target-s390x/
  302. target-sh4/
  303. target-sparc/
  304. target-unicore32/
  305. target-xtensa/
  306. targphys.h
  307. tcg-runtime.c
  308. tcg/
  309. test-coroutine.c
  310. test-qmp-commands.c
  311. test-visitor.c
  312. tests/
  313. thunk.c
  314. thunk.h
  315. trace-events
  316. trace/
  317. translate-all.c
  318. uboot_image.h
  319. ui/
  320. usb-bsd.c
  321. usb-linux.c
  322. usb-redir.c
  323. usb-stub.c
  324. user-exec.c
  325. version.rc
  326. vgafont.h
  327. vl.c
  328. x86_64.ld
  329. xen-all.c
  330. xen-mapcache.c
  331. xen-mapcache.h
  332. xen-stub.c
  333. xtensa-semi.c