]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 3 Jul 2018 08:49:20 +0000 (09:49 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 3 Jul 2018 08:49:20 +0000 (09:49 +0100)
commit46d0885adff9b99622d72f23a8b04c298a8bf91d
tree119f18ba2fa62497f917f4058fb6519241d43ab0
parente8c858944ea61923ca563bb5905bf04624d05f16
parent5d9c9ea22ab4f3b3ee497523e34b6f4d3281f62d
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>
hw/i386/acpi-build.c