From: Roger Pau Monne <roger.pau@citrix.com>
Date: Thu, 15 Oct 2015 17:23:57 +0000 (+0200)
Subject: libxc: fix the types used in xc_dom_image to build HVM guests
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2381
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c787425fdf2a4b42ffbff257123dfcb25528efbb;p=xen.git

libxc: fix the types used in xc_dom_image to build HVM guests

Fix the types used to store the memory parameters of an HVM guest,
previously they defaulted to unsigned long on 32bit toolstack builds, which
is wrong because a 32bit value cannot hold a 64bit memory address that
crosses the 4GB boundary.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h
index e52b023930..7cb6b0cbef 100644
--- a/tools/libxc/include/xc_dom.h
+++ b/tools/libxc/include/xc_dom.h
@@ -187,10 +187,10 @@ struct xc_dom_image {
 
     /* HVM specific fields. */
     xen_pfn_t target_pages;
-    xen_pfn_t mmio_start;
-    xen_pfn_t mmio_size;
-    xen_pfn_t lowmem_end;
-    xen_pfn_t highmem_end;
+    xen_paddr_t mmio_start;
+    xen_paddr_t mmio_size;
+    xen_paddr_t lowmem_end;
+    xen_paddr_t highmem_end;
 
     /* Extra ACPI tables passed to HVMLOADER */
     struct xc_hvm_firmware_module acpi_module;