From: Peter Maydell Date: Mon, 12 Sep 2016 10:25:40 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: v2.8.0-rc0~151 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c569c537e5c60ee9b9ed92b7a57d766c78b71318;p=qemu-xen-unstable.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio,vhost,pc: fixes and updates balloon fixes wrt migration virtio-vsock device support Signed-off-by: Michael S. Tsirkin # gpg: Signature made Fri 09 Sep 2016 22:36:13 BST # gpg: using RSA key 0x281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " # 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-vsock: add virtio sockets device tests/acpi: speedup acpi tests virtio-pci: minor refactoring vhost: don't set vring call if no vector virtio-pci: error out when both legacy and modern modes are disabled virtio-balloon: fix stats vq migration virtio: add virtqueue_rewind() virtio-balloon: discard virtqueue element on reset virtio: zero vq->inuse in virtio_reset() virtio-pci: reduce modern_mem_bar size target-i386: present virtual L3 cache info for vcpus pc: Add 2.8 machine virtio-pci: use size from correct structure virtio: Tell the user what went wrong when event_notifier_init failed Signed-off-by: Peter Maydell --- c569c537e5c60ee9b9ed92b7a57d766c78b71318