Google Git
Sign in
qemu / qemu / 1c7ab0930a3e02e6e54722c20b6b586364f387a7
commit1c7ab0930a3e02e6e54722c20b6b586364f387a7[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Tue Nov 17 11:50:11 2020 +0000
committerPeter Maydell <peter.maydell@linaro.org>Tue Nov 17 11:50:11 2020 +0000
tree92d108478a966e1bc18b1f4748e8fbd1d5e49ce9
parent48aa8f0ac536db3550a35c295ff7de94e4c33739 [diff]
parent91010f0407a07caeacb11037bb5b493bab7ce203 [diff]
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc,vhost: fixes

Fixes all over the place.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 17 Nov 2020 09:17:12 GMT
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  vhost-user-blk/scsi: Fix broken error handling for socket call
  contrib/libvhost-user: Fix bad printf format specifiers
  hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off
  configure: mark vhost-user Linux-only
  vhost-user-blk-server: depend on CONFIG_VHOST_USER
  meson: move vhost_user_blk_server to meson.build
  vhost-user: fix VHOST_USER_ADD/REM_MEM_REG truncation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	meson.build
tree: 92d108478a966e1bc18b1f4748e8fbd1d5e49ce9
  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. CODING_STYLE.rst
  74. configure
  75. COPYING
  76. COPYING.LIB
  77. cpu.c
  78. cpus-common.c
  79. disas.c
  80. exec-vary.c
  81. gdbstub.c
  82. gitdm.config
  83. hmp-commands-info.hx
  84. hmp-commands.hx
  85. iothread.c
  86. job-qmp.c
  87. job.c
  88. Kconfig
  89. Kconfig.host
  90. LICENSE
  91. MAINTAINERS
  92. Makefile
  93. memory_ldst.c.inc
  94. meson.build
  95. meson_options.txt
  96. module-common.c
  97. os-posix.c
  98. os-win32.c
  99. qemu-bridge-helper.c
  100. qemu-edid.c
  101. qemu-img-cmds.hx
  102. qemu-img.c
  103. qemu-io-cmds.c
  104. qemu-io.c
  105. qemu-keymap.c
  106. qemu-nbd.c
  107. qemu-options-wrapper.h
  108. qemu-options.h
  109. qemu-options.hx
  110. qemu.nsi
  111. qemu.sasl
  112. README.rst
  113. replication.c
  114. replication.h
  115. thunk.c
  116. trace-events
  117. VERSION
  118. version.rc