]> 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>
Thu, 30 Mar 2017 17:02:33 +0000 (18:02 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Mar 2017 17:02:33 +0000 (18:02 +0100)
commitddc2c3a57e0752c0650fdb735a8b8322542d4248
treeeb7c67ce8894aaec18232fdbc78664fb1436e246
parente839001d5bb6c84932e2d82bd383477b2023f407
parent0d876080a394993a8dea494ebf2d806dc0983107
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

vhost, pc: fixes

More fixes for 2.9. Region caching is still causing
issues around reset, but we seem to be getting there.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 30 Mar 2017 17:14:45 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:
  tests/acpi: don't pack a structure
  vhost: generalize iommu memory region

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>