diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-04-07 14:54:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-04-07 14:54:55 +0100 |
| commit | f55a585d1037e5de6088f25e75443c2776786e29 (patch) | |
| tree | 68933e13081279fba9302e8b467167b64b2133a1 /include | |
| parent | 90fb864a7df0a9af677352e94f8225f7b03de922 (diff) | |
| parent | 81fb1e646e4da29f8e1639022241323b956b67e4 (diff) | |
| download | qemu-f55a585d1037e5de6088f25e75443c2776786e29.zip qemu-f55a585d1037e5de6088f25e75443c2776786e29.tar.gz qemu-f55a585d1037e5de6088f25e75443c2776786e29.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci, pc, virtio: fixes
intel-iommu fixes
virtio typo fixes
linker: a couple of asserts for consistency/security
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 02 Apr 2019 16:51:19 BST
# gpg: using RSA key 281F0DB8D28D5469
# 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:
intel_iommu: Drop extended root field
intel_iommu: Fix root_scalable migration breakage
virtio-net: Fix typo in comment
intel_iommu: Correct caching-mode error message
acpi: verify file entries in bios_linker_loader_add_pointer()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/intel_iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 536f626..12f3d26 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -234,7 +234,6 @@ struct IntelIOMMUState { bool scalable_mode; /* RO - is Scalable Mode supported? */ dma_addr_t root; /* Current root table pointer */ - bool root_extended; /* Type of root table (extended or not) */ bool root_scalable; /* Type of root table (scalable or not) */ bool dmar_enabled; /* Set if DMA remapping is enabled */ |