From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 12 Nov 2015 15:15:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8f0da01d189077647adf79618acc3832f77b7918;p=qemu.git

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, vhost: fixes for 2.5

This fixes a performance regression with virtio 1,
and makes device stop/start more robust for vhost-user.
virtio devices on pcie bus now have pcie and pm
capability, as required by the PCI Express spec.
migration now works better with virtio 9p.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 12 Nov 2015 14:40:42 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  virtio-9p: add savem handlers
  hw/virtio: Add PCIe capability to virtio devices
  vhost: send SET_VRING_ENABLE at start/stop
  vhost: rename RESET_DEVICE backto RESET_OWNER
  vhost-user: modify SET_LOG_BASE to pass mmap size and offset
  virtio-pci: unbreak queue_enable read
  virtio-pci: introduce pio notification capability for modern device
  virtio-pci: use zero length mmio eventfd for 1.0 notification cap when possible
  KVM: add support for any length io eventfd
  memory: don't try to adjust endianness for zero length eventfd
  virtio-pci: fix 1.0 virtqueue migration

Conflicts:
	include/hw/compat.h
[Fixed a trivial merge conflict in compat.h]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

8f0da01d189077647adf79618acc3832f77b7918
diff --cc include/hw/compat.h
index 896a1b0508,845aace577..d0b1c4f1ef
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@@ -6,11 -6,15 +6,19 @@@
              .driver   = "virtio-blk-device",\
              .property = "scsi",\
              .value    = "true",\
 +        },{\
 +            .driver   = "e1000",\
 +            .property = "extra_mac_registers",\
 +            .value    = "off",\
-          },
+         },{\
+             .driver   = "virtio-pci",\
+             .property = "x-disable-pcie",\
+             .value    = "on",\
+         },{\
+             .driver   = "virtio-pci",\
+             .property = "migrate-extra",\
+             .value    = "off",\
+         },
  
  #define HW_COMPAT_2_3 \
          {\