From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 17 Nov 2020 11:50:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: qemu-xen-4.16.0-rc4~481
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1c7ab0930a3e02e6e54722c20b6b586364f387a7;p=qemu-xen.git

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
---

1c7ab0930a3e02e6e54722c20b6b586364f387a7
diff --cc meson.build
index 132bc49782,7fd874eec7..10132eeae0
--- a/meson.build
+++ b/meson.build
@@@ -2108,7 -2116,8 +2122,8 @@@ summary_info += {'vhost-net support': c
  summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
  summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
  summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
 -summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_KERNEL')}
 +summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
+ summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
  summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
  summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
  summary_info += {'Trace backends':    config_host['TRACE_BACKENDS']}