From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH v5 1/9] tools: libxl: use uint64_t not unsigned long long for addresses Date: Thu, 22 May 2014 10:46:36 +0100 Message-ID: <1400752004-9731-1-git-send-email-ian.campbell@citrix.com> References: <1400751582.11409.46.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1400751582.11409.46.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: tim@xen.org, stefano.stabellini@eu.citrix.com, julien.grall@linaro.org, ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson --- v2: New patch --- tools/libxl/libxl_arm.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 4f0f0e2..215ef9e 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -256,11 +256,10 @@ static int make_psci_node(libxl__gc *gc, void *fdt) } static int make_memory_node(libxl__gc *gc, void *fdt, - unsigned long long base, - unsigned long long size) + uint64_t base, uint64_t size) { int res; - const char *name = GCSPRINTF("memory@%08llx", base); + const char *name = GCSPRINTF("memory@%"PRIx64, base); res = fdt_begin_node(fdt, name); if (res) return res; @@ -269,7 +268,7 @@ static int make_memory_node(libxl__gc *gc, void *fdt, if (res) return res; res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, - 1, (uint64_t)base, (uint64_t)size); + 1, base, size); if (res) return res; res = fdt_end_node(fdt); @@ -279,13 +278,11 @@ static int make_memory_node(libxl__gc *gc, void *fdt, } static int make_intc_node(libxl__gc *gc, void *fdt, - unsigned long long gicd_base, - unsigned long long gicd_size, - unsigned long long gicc_base, - unsigned long long gicc_size) + uint64_t gicd_base, uint64_t gicd_size, + uint64_t gicc_base, uint64_t gicc_size) { int res; - const char *name = GCSPRINTF("interrupt-controller@%08llx", gicd_base); + const char *name = GCSPRINTF("interrupt-controller@%"PRIx64, gicd_base); res = fdt_begin_node(fdt, name); if (res) return res; @@ -307,8 +304,8 @@ static int make_intc_node(libxl__gc *gc, void *fdt, res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, 2, - (uint64_t)gicd_base, (uint64_t)gicd_size, - (uint64_t)gicc_base, (uint64_t)gicc_size); + gicd_base, gicd_size, + gicc_base, gicc_size); if (res) return res; res = fdt_property_cell(fdt, "linux,phandle", PHANDLE_GIC); -- 1.7.10.4