intel_iommu: fix bug to read DMAR_RTADDR_REG
PATCH 1/1 intel_iommu: fix bug to read DMAR_RTADDR_REG
Should directly read DMAR_RTADDR_REG but not using 's->root'. Because 's->root' is modified in 'vtd_root_table_setup()' so that the first 12 bits are omitted. This causes the guest iommu debugfs cannot show pasid tables.
Signed-off-by Yi Sun <[email protected]>
--- hw/i386/intel_iommu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/i386/intel_iommu.c +3 -4
@@ -2610,16 +2610,15 @@ static uint64_t vtd_mem_read(void *opaque, hwaddr addr, unsigned size)switch (addr) {/* Root Table Address Register, 64-bit */ case DMAR_RTADDR_REG : + val =vtd_get_quad_raw (s,DMAR_RTADDR_REG );if (size ==4 ) { - val = s->root & ((1ULL <<32 ) -1 ); - }else { - val = s->root; + val = val & ((1ULL <<32 ) -1 ); }break ;case DMAR_RTADDR_REG_HI :assert (size ==4 ); - val = s->root >>32 ; + val =vtd_get_quad_raw (s,DMAR_RTADDR_REG ) >>32 ;break ;/* Invalidation Queue Address Register, 64-bit */
Signature · 1 line
2.17.1
Quoted 6 lines · Yi Sun
Should directly read
DMAR_RTADDR_REGbut not using 's->root'. Because 's->root' is modified in 'vtd_root_table_setup()' so that the first 12 bits are omitted. This causes the guest iommu debugfs cannot show pasid tables.Signed-off-by Yi Sun <[email protected]>
Reviewed-by Peter Xu <[email protected]>
Signature · 1 line
Peter Xu