diff options
author | Peter Maydell | 2018-07-03 10:49:20 +0200 |
---|---|---|
committer | Peter Maydell | 2018-07-03 10:49:20 +0200 |
commit | 46d0885adff9b99622d72f23a8b04c298a8bf91d (patch) | |
tree | 119f18ba2fa62497f917f4058fb6519241d43ab0 /hw/display/vga-pci.c | |
parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
parent | virtio-rng: process pending requests on DRIVER_OK (diff) | |
download | qemu-46d0885adff9b99622d72f23a8b04c298a8bf91d.tar.gz qemu-46d0885adff9b99622d72f23a8b04c298a8bf91d.tar.xz qemu-46d0885adff9b99622d72f23a8b04c298a8bf91d.zip |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, virtio: fixes
A couple of fixes to amd iommu, and a fix to virtio iommu.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 28 Jun 2018 02:46:45 BST
# gpg: using RSA key 281F0DB8D28D5469
# 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:
virtio-rng: process pending requests on DRIVER_OK
hw/i386: Fix AMDVI GATS and HATS encodings
hw/i386: Fix IVHD entry length for AMD IOMMU
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/vga-pci.c')
0 files changed, 0 insertions, 0 deletions