Fix 17725:c0c0f4fa8850: use type paddr_t instead of unsigned long for physcial memory address
PATCH 1/1 Fix 17725:c0c0f4fa8850: use type paddr_t instead of unsigned long for physcial memory address
Otherwise, the address overflows on PAE system with memory size > 4G.
Signed-off-by Yang, Xiaowei <[email protected]>
Thanks,
Xiaowei
xen/arch/x86/setup.c +4 -4
@@ -1100,10 +1100,10 @@ void arch_get_xen_caps(xen_capabilities_#endif } -int xen_in_range (unsigned long start,unsigned long end) -{ - start = max_t(unsigned long, start, xenheap_phys_start); - end = min_t(unsigned long, end, xenheap_phys_end); +int xen_in_range (paddr_t start,paddr_t end) +{ + start =max_t (paddr_t, start, xenheap_phys_start); + end =min_t (paddr_t, end, xenheap_phys_end);return start < end; }
xen/arch/x86/tboot.c +3 -3
@@ -96,13 +96,13 @@ int tboot_in_measured_env(void)return (g_tboot_shared !=NULL ); } -int tboot_in_range (unsigned long start,unsigned long end) +int tboot_in_range (paddr_t start,paddr_t end) {if ( g_tboot_shared ==NULL || g_tboot_shared->version <0x02 )return 0 ; - start = max_t(unsigned long, start, g_tboot_shared->tboot_base); - end = min_t(unsigned long, end, + start =max_t (paddr_t, start, g_tboot_shared->tboot_base); + end =min_t (paddr_t, end, g_tboot_shared->tboot_base + g_tboot_shared->tboot_size);return start < end;
xen/drivers/passthrough/vtd/iommu.c +4 -3
@@ -1074,7 +1074,8 @@ static int intel_iommu_domain_init(strucstruct hvm_iommu *hd =domain_hvm_iommu (d);struct iommu *iommu =NULL ;int guest_width =DEFAULT_DOMAIN_ADDRESS_WIDTH ; -int i, adjust_width, agaw; +int adjust_width, agaw; +u64 i;unsigned long sagaw;struct acpi_drhd_unit *drhd;
@@ -1102,8 +1103,8 @@ static int intel_iommu_domain_init(strucif ( d->domain_id ==0 ) { -extern int xen_in_range (unsigned long start,unsigned long end); -extern int tboot_in_range (unsigned long start,unsigned long end); +extern int xen_in_range (paddr_t start,paddr_t end); +extern int tboot_in_range (paddr_t start,paddr_t end);/* * Set up 1:1 page table for dom0 except the critical segments
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel