diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-17 11:50:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-17 11:50:11 +0000 |
| commit | 1c7ab0930a3e02e6e54722c20b6b586364f387a7 (patch) | |
| tree | 92d108478a966e1bc18b1f4748e8fbd1d5e49ce9 /qobject | |
| parent | 48aa8f0ac536db3550a35c295ff7de94e4c33739 (diff) | |
| parent | 91010f0407a07caeacb11037bb5b493bab7ce203 (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
Diffstat (limited to 'qobject')
0 files changed, 0 insertions, 0 deletions