Google Git
Sign in
qemu / qemu / 8c1c07929feae876202ba26f07a540c5115c18cd
commit8c1c07929feae876202ba26f07a540c5115c18cd[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Thu Sep 24 18:48:45 2020 +0100
committerPeter Maydell <peter.maydell@linaro.org>Thu Sep 24 18:48:45 2020 +0100
tree20f6c8e2ac556bfb3c88a98c0d0cb2689de0263e
parent1bd5556f6686365e76f7ff67fe67260c449e8345 [diff]
parentd73415a315471ac0b127ed3fad45c8ec5d711de1 [diff]
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

This includes the atomic_ -> qatomic_ rename that touches many files and is
prone to conflicts.

# gpg: Signature made Wed 23 Sep 2020 17:08:43 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  qemu/atomic.h: rename atomic_ to qatomic_
  tests: add test-fdmon-epoll
  fdmon-poll: reset npfd when upgrading to fdmon-epoll
  gitmodules: add qemu.org vbootrom submodule
  gitmodules: switch to qemu.org meson mirror
  gitmodules: switch to qemu.org qboot mirror
  docs/system: clarify deprecation schedule
  virtio-crypto: don't modify elem->in/out_sg
  virtio-blk: undo destructive iov_discard_*() operations
  util/iov: add iov_discard_undo()
  virtio: add vhost-user-fs-ccw device
  libvhost-user: handle endianness as mandated by the spec
  MAINTAINERS: add Stefan Hajnoczi as block/nvme.c maintainer

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