diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-09 10:32:53 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-09 10:32:53 +0000 |
| commit | 7a5853cec479a448edae0fb2aaf4e2f78c9c774d (patch) | |
| tree | 1a43b58ded6129084fda0047909f563bbc5ed2b7 /tests/test-io-channel-file.c | |
| parent | 67f17e23baca5dd545fe98b01169cc351a70fe35 (diff) | |
| parent | a6f65f4fc217713ee2c78b99baae1cc31c761778 (diff) | |
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 <mst@redhat.com>
# 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 <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-io-channel-file.c')
0 files changed, 0 insertions, 0 deletions