From: Peter Maydell Date: Mon, 9 Mar 2020 10:32:53 +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=7a5853cec479a448edae0fb2aaf4e2f78c9c774d;p=qemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio, pci, pc: fixes, cleanups, features Bugfixes, cleanups all over the place. Ability to disable hotplug for pci express ports. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Sun 08 Mar 2020 13:27:54 GMT # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin " [full] # gpg: aka "Michael S. Tsirkin " [full] # 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/i386/intel_iommu: Simplify vtd_find_as_from_bus_num() logic vhost-vsock: fix error message output vhost: correctly turn on VIRTIO_F_IOMMU_PLATFORM pcie_root_port: Add hotplug disabling option Signed-off-by: Peter Maydell --- 7a5853cec479a448edae0fb2aaf4e2f78c9c774d