The following changes since commit c2a57aae9a1c3dd7de77daf5478df10379aeeebf:
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging (2016-09-09 12:49:41 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to fc0b9b0e1cbb49017ea882758634cf876be17bc3: vhost-vsock: add virtio sockets device (2016-09-10 00:28:08 +0300) ---------------------------------------------------------------- virtio,vhost,pc: fixes and updates balloon fixes wrt migration virtio-vsock device support Signed-off-by: Michael S. Tsirkin <m...@redhat.com> ---------------------------------------------------------------- Greg Kurz (1): virtio-pci: error out when both legacy and modern modes are disabled Jason Wang (1): vhost: don't set vring call if no vector Ladi Prosek (2): virtio-balloon: discard virtqueue element on reset virtio-balloon: fix stats vq migration Longpeng(Mike) (2): pc: Add 2.8 machine target-i386: present virtual L3 cache info for vcpus Marcel Apfelbaum (2): virtio-pci: reduce modern_mem_bar size tests/acpi: speedup acpi tests Michael S. Tsirkin (2): virtio-pci: use size from correct structure virtio-pci: minor refactoring Stefan Hajnoczi (3): virtio: zero vq->inuse in virtio_reset() virtio: add virtqueue_rewind() vhost-vsock: add virtio sockets device Thomas Huth (1): virtio: Tell the user what went wrong when event_notifier_init failed configure | 10 + hw/s390x/virtio-ccw.h | 15 ++ hw/virtio/virtio-pci.h | 23 +++ include/hw/compat.h | 6 +- include/hw/i386/pc.h | 12 ++ include/hw/pci/pci.h | 1 + include/hw/virtio/vhost-backend.h | 5 + include/hw/virtio/vhost-vsock.h | 41 ++++ include/hw/virtio/virtio.h | 1 + target-i386/cpu.h | 6 + hw/i386/pc_piix.c | 16 +- hw/i386/pc_q35.c | 13 +- hw/s390x/virtio-ccw.c | 54 +++++ hw/virtio/vhost-backend.c | 17 ++ hw/virtio/vhost-vsock.c | 417 ++++++++++++++++++++++++++++++++++++++ hw/virtio/vhost.c | 14 ++ hw/virtio/virtio-balloon.c | 14 ++ hw/virtio/virtio-bus.c | 3 +- hw/virtio/virtio-pci.c | 83 +++++++- hw/virtio/virtio.c | 23 +++ target-i386/cpu.c | 49 ++++- tests/bios-tables-test.c | 39 ++-- hw/virtio/Makefile.objs | 2 + 23 files changed, 825 insertions(+), 39 deletions(-) create mode 100644 include/hw/virtio/vhost-vsock.h create mode 100644 hw/virtio/vhost-vsock.c