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 <mst@redhat.com> # gpg: Signature made Fri 09 Sep 2016 22:36:13 BST # gpg: using RSA key 0x281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # 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 <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- configure 10 additions, 0 deletionsconfigure
- hw/i386/pc_piix.c 13 additions, 3 deletionshw/i386/pc_piix.c
- hw/i386/pc_q35.c 11 additions, 2 deletionshw/i386/pc_q35.c
- hw/s390x/virtio-ccw.c 54 additions, 0 deletionshw/s390x/virtio-ccw.c
- hw/s390x/virtio-ccw.h 15 additions, 0 deletionshw/s390x/virtio-ccw.h
- hw/virtio/Makefile.objs 2 additions, 0 deletionshw/virtio/Makefile.objs
- hw/virtio/vhost-backend.c 17 additions, 0 deletionshw/virtio/vhost-backend.c
- hw/virtio/vhost-vsock.c 417 additions, 0 deletionshw/virtio/vhost-vsock.c
- hw/virtio/vhost.c 14 additions, 0 deletionshw/virtio/vhost.c
- hw/virtio/virtio-balloon.c 14 additions, 0 deletionshw/virtio/virtio-balloon.c
- hw/virtio/virtio-bus.c 2 additions, 1 deletionhw/virtio/virtio-bus.c
- hw/virtio/virtio-pci.c 75 additions, 8 deletionshw/virtio/virtio-pci.c
- hw/virtio/virtio-pci.h 23 additions, 0 deletionshw/virtio/virtio-pci.h
- hw/virtio/virtio.c 23 additions, 0 deletionshw/virtio/virtio.c
- include/hw/compat.h 5 additions, 1 deletioninclude/hw/compat.h
- include/hw/i386/pc.h 12 additions, 0 deletionsinclude/hw/i386/pc.h
- include/hw/pci/pci.h 1 addition, 0 deletionsinclude/hw/pci/pci.h
- include/hw/virtio/vhost-backend.h 5 additions, 0 deletionsinclude/hw/virtio/vhost-backend.h
- include/hw/virtio/vhost-vsock.h 41 additions, 0 deletionsinclude/hw/virtio/vhost-vsock.h
- include/hw/virtio/virtio.h 1 addition, 0 deletionsinclude/hw/virtio/virtio.h
Loading
Please register or sign in to comment