Merge commit '92aa5c6d77ac29574c1717bcf57827fa1e586f31' into upstream-merge

* commit '92aa5c6d77ac29574c1717bcf57827fa1e586f31': (43 commits)
  iostatus: move BlockdevOnError declaration to QAPI
  iostatus: rename BlockErrorAction, BlockQMPEventAction
  qemu-iotests: add test for pausing a streaming operation
  qmp: add block-job-pause and block-job-resume
  block: add support for job pause/resume
  qmp: add 'busy' member to BlockJobInfo
  block: add block_job_query
  block: move job APIs to separate files
  block: fix documentation of block_job_cancel_sync
  qerror/block: introduce QERR_BLOCK_JOB_NOT_ACTIVE
  qemu-iotests: add initial tests for live block commit
  QAPI: add command for live block commit, 'block-commit'
  block: helper function, to find the base image of a chain
  blockdev: rename block_stream_cb to a generic block_job_cb
  block: add live block commit functionality
  block: add support functions for live commit, to find and delete images.
  block: Support GlusterFS as a QEMU block backend.
  configure: Add a config option for GlusterFS as block backend
  aio: Another fix to the walking_handlers logic
  qemu: URI parsing library
  ...

Conflicts:
	blockdev.c

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