diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 11:14:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 11:14:07 +0100 |
| commit | 8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa (patch) | |
| tree | 3387529623a624e39a85139e4a9619f2619af471 /include | |
| parent | f4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c (diff) | |
| parent | bc277a52fbea1532d1adf30ba0edf15ab3dcdead (diff) | |
| download | qemu-8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa.zip qemu-8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa.tar.gz qemu-8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, pci, vhost: fixes
Some fixes all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 08 Jun 2017 20:04:24 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:
hw/pcie: fix the generic pcie root port to support migration
nvdimm acpi: fix region format interface code
vhost-user-bridge: fix iov_restore_front() warning
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/compat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/compat.h b/include/hw/compat.h index 400c64b..26cd585 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -14,6 +14,10 @@ .driver = "virtio-net-device",\ .property = "x-mtu-bypass-backend",\ .value = "off",\ + },{\ + .driver = "pcie-root-port",\ + .property = "x-migrate-msix",\ + .value = "false",\ }, #define HW_COMPAT_2_8 \ |