Google Git
Sign in
qemu / qemu / 718d7f4f9cf772e5784093d8e6085680a235acdb
commit718d7f4f9cf772e5784093d8e6085680a235acdb[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Tue Jul 18 13:09:51 2017 +0100
committerPeter Maydell <peter.maydell@linaro.org>Tue Jul 18 13:09:51 2017 +0100
treee6754e6f1f280fa1530fe3a20a0f30cb6988ab83
parented6458726a9d987f5466f7b92469085d2a2d3685 [diff]
parent593ed6f0a3c827a13a274e47f6fa980344234f9c [diff]
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Mon 17 Jul 2017 16:40:18 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  block: fix shadowed variable in bdrv_co_pdiscard
  util/aio-win32: Only select on what we are actually waiting for

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
tree: e6754e6f1f280fa1530fe3a20a0f30cb6988ab83
  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. slirp/
  34. stubs/
  35. target/
  36. tcg/
  37. tests/
  38. trace/
  39. ui/
  40. util/
  41. dtc
  42. pixman
  43. .dir-locals.el
  44. .exrc
  45. .gdbinit
  46. .gitignore
  47. .gitmodules
  48. .mailmap
  49. .shippable.yml
  50. .travis.yml
  51. arch_init.c
  52. atomic_template.h
  53. balloon.c
  54. block.c
  55. blockdev-nbd.c
  56. blockdev.c
  57. blockjob.c
  58. bootdevice.c
  59. bt-host.c
  60. bt-vhci.c
  61. Changelog
  62. CODING_STYLE
  63. configure
  64. COPYING
  65. COPYING.LIB
  66. cpus-common.c
  67. cpus.c
  68. device-hotplug.c
  69. device_tree.c
  70. disas.c
  71. dma-helpers.c
  72. dump.c
  73. exec.c
  74. gdbstub.c
  75. HACKING
  76. hax-stub.c
  77. hmp-commands-info.hx
  78. hmp-commands.hx
  79. hmp.c
  80. hmp.h
  81. ioport.c
  82. iothread.c
  83. LICENSE
  84. MAINTAINERS
  85. Makefile
  86. Makefile.objs
  87. Makefile.target
  88. memory.c
  89. memory_ldst.inc.c
  90. memory_mapping.c
  91. module-common.c
  92. monitor.c
  93. numa.c
  94. os-posix.c
  95. os-win32.c
  96. qapi-schema.json
  97. qdev-monitor.c
  98. qdict-test-data.txt
  99. qemu-bridge-helper.c
  100. qemu-doc.texi
  101. qemu-ga.texi
  102. qemu-img-cmds.hx
  103. qemu-img.c
  104. qemu-img.texi
  105. qemu-io-cmds.c
  106. qemu-io.c
  107. qemu-nbd.c
  108. qemu-nbd.texi
  109. qemu-option-trace.texi
  110. qemu-options-wrapper.h
  111. qemu-options.h
  112. qemu-options.hx
  113. qemu-seccomp.c
  114. qemu-tech.texi
  115. qemu.nsi
  116. qemu.sasl
  117. qmp.c
  118. qtest.c
  119. README
  120. replication.c
  121. replication.h
  122. rules.mak
  123. softmmu_template.h
  124. thunk.c
  125. tpm.c
  126. trace-events
  127. user-exec-stub.c
  128. user-exec.c
  129. VERSION
  130. version.rc
  131. vl.c