diff options
| author | Peter Maydell | 2019-04-07 15:54:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-04-07 15:54:55 +0200 |
| commit | f55a585d1037e5de6088f25e75443c2776786e29 (patch) | |
| tree | 68933e13081279fba9302e8b467167b64b2133a1 /hw/i386/intel_iommu_internal.h | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20190405a'... (diff) | |
| parent | intel_iommu: Drop extended root field (diff) | |
| download | qemu-f55a585d1037e5de6088f25e75443c2776786e29.tar.gz qemu-f55a585d1037e5de6088f25e75443c2776786e29.tar.xz qemu-f55a585d1037e5de6088f25e75443c2776786e29.zip | |
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 'hw/i386/intel_iommu_internal.h')
| -rw-r--r-- | hw/i386/intel_iommu_internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index 1160618177..c1235a7063 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -171,7 +171,6 @@ #define VTD_CCMD_FM(val) (((val) >> 32) & 3ULL) /* RTADDR_REG */ -#define VTD_RTADDR_RTT (1ULL << 11) #define VTD_RTADDR_SMT (1ULL << 10) #define VTD_RTADDR_ADDR_MASK(aw) (VTD_HAW_MASK(aw) ^ 0xfffULL) |