Google Git
Sign in
qemu / qemu / d32e41a1188e929cc0fb16829ce3736046951e39
commitd32e41a1188e929cc0fb16829ce3736046951e39[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Fri May 18 14:11:51 2018 +0100
committerPeter Maydell <peter.maydell@linaro.org>Fri May 18 14:11:52 2018 +0100
tree66b60cd46339a23cd8fb5cc36f52db7135b71028
parentdba0f15a3b3a2e72a526be665efad73f3c34a5dd [diff]
parentcd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5 [diff]
Merge remote-tracking branch 'remotes/famz/tags/docker-and-block-pull-request' into staging

Docker and block patches

Two fairly small fixes.

# gpg: Signature made Fri 18 May 2018 10:17:06 BST
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/docker-and-block-pull-request:
  iothread: fix epollfd leak in the process of delIOThread
  docker: Fix trivial typo

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
tree: 66b60cd46339a23cd8fb5cc36f52db7135b71028
  1. accel/
  2. audio/
  3. backends/
  4. block/
  5. bsd-user/
  6. chardev/
  7. contrib/
  8. crypto/
  9. default-configs/
  10. disas/
  11. docs/
  12. fpu/
  13. fsdev/
  14. gdb-xml/
  15. hw/
  16. include/
  17. io/
  18. libdecnumber/
  19. linux-headers/
  20. linux-user/
  21. migration/
  22. nbd/
  23. net/
  24. pc-bios/
  25. po/
  26. qapi/
  27. qga/
  28. qobject/
  29. qom/
  30. replay/
  31. roms/
  32. scripts/
  33. scsi/
  34. slirp/
  35. stubs/
  36. target/
  37. tcg/
  38. tests/
  39. trace/
  40. ui/
  41. util/
  42. capstone
  43. dtc
  44. .dir-locals.el
  45. .editorconfig
  46. .exrc
  47. .gdbinit
  48. .gitignore
  49. .gitmodules
  50. .gitpublish
  51. .mailmap
  52. .shippable.yml
  53. .travis.yml
  54. arch_init.c
  55. balloon.c
  56. block.c
  57. blockdev-nbd.c
  58. blockdev.c
  59. blockjob.c
  60. bootdevice.c
  61. bt-host.c
  62. bt-vhci.c
  63. Changelog
  64. CODING_STYLE
  65. configure
  66. COPYING
  67. COPYING.LIB
  68. COPYING.PYTHON
  69. cpus-common.c
  70. cpus.c
  71. device-hotplug.c
  72. device_tree.c
  73. disas.c
  74. dma-helpers.c
  75. dump.c
  76. exec.c
  77. gdbstub.c
  78. HACKING
  79. hmp-commands-info.hx
  80. hmp-commands.hx
  81. hmp.c
  82. hmp.h
  83. ioport.c
  84. iothread.c
  85. LICENSE
  86. MAINTAINERS
  87. Makefile
  88. Makefile.objs
  89. Makefile.target
  90. memory.c
  91. memory_ldst.inc.c
  92. memory_mapping.c
  93. module-common.c
  94. monitor.c
  95. numa.c
  96. os-posix.c
  97. os-win32.c
  98. qdev-monitor.c
  99. qdict-test-data.txt
  100. qemu-bridge-helper.c
  101. qemu-doc.texi
  102. qemu-ga.texi
  103. qemu-img-cmds.hx
  104. qemu-img.c
  105. qemu-img.texi
  106. qemu-io-cmds.c
  107. qemu-io.c
  108. qemu-keymap.c
  109. qemu-nbd.c
  110. qemu-nbd.texi
  111. qemu-option-trace.texi
  112. qemu-options-wrapper.h
  113. qemu-options.h
  114. qemu-options.hx
  115. qemu-seccomp.c
  116. qemu-tech.texi
  117. qemu.nsi
  118. qemu.sasl
  119. qmp.c
  120. qtest.c
  121. README
  122. replication.c
  123. replication.h
  124. rules.mak
  125. thunk.c
  126. tpm.c
  127. trace-events
  128. VERSION
  129. version.rc
  130. vl.c