From patchwork Tue May 13 11:29:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30029 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A284F20369 for ; Tue, 13 May 2014 11:30:15 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rp18sf943102iec.1 for ; Tue, 13 May 2014 04:30:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=rnU0NJDJFrM9tQ7lAmlotanp2dsPTkCO2i7aZ6m/Xwo=; b=Q/AVaVlxekHtaNevo2LKkL9CBetT9NMNlGCGFotdwkfQNDC82TbF5/YmMpcmgi+nXI CxlzmLo8tY8SG/CEhisAY5p+clqiW9cvK9goxlLoffcZUc+M5LoyxAKQvxiWjKJfhrUC Bblevx+MuyTGGgwwx5YLF4vz8U3oA6A9CIsFBzdKAPEJAfFctRC3qiuvAftQwwZeeTw0 2nr+pOeiZZaJIUIaPnd+DeB5GWzR1DcBBDuukpIxuNxMgDGvQucErUwBqlxI06JYaUwZ PFGy2OxXG/Or/fWbG/vsZO9FJhcdboUtWrgWV3O2NFb2kD/lehQa96hyFSBpnG0U0Zna iqvQ== X-Gm-Message-State: ALoCoQmwnMW7EENFvwqj1RJgoke77YcyYK4rv7wKiqR9L/nx3ydILGnN9oFGTzL2LJP13K9wPABV X-Received: by 10.43.141.196 with SMTP id jf4mr15603143icc.9.1399980615113; Tue, 13 May 2014 04:30:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.46 with SMTP id k43ls1142773qgk.58.gmail; Tue, 13 May 2014 04:30:15 -0700 (PDT) X-Received: by 10.52.13.41 with SMTP id e9mr24263009vdc.21.1399980614987; Tue, 13 May 2014 04:30:14 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id o2si2586499vew.169.2014.05.13.04.30.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 04:30:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ij19so228687vcb.14 for ; Tue, 13 May 2014 04:30:14 -0700 (PDT) X-Received: by 10.220.195.196 with SMTP id ed4mr2073vcb.42.1399980614905; Tue, 13 May 2014 04:30:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp143259vcb; Tue, 13 May 2014 04:30:14 -0700 (PDT) X-Received: by 10.220.5.10 with SMTP id 10mr12077vct.40.1399980614193; Tue, 13 May 2014 04:30:14 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id kr17si2589006vcb.133.2014.05.13.04.30.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 13 May 2014 04:30:14 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WkAtx-0007sU-EF; Tue, 13 May 2014 11:29:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WkAtv-0007rx-G7 for xen-devel@lists.xen.org; Tue, 13 May 2014 11:29:39 +0000 Received: from [85.158.139.211:47851] by server-10.bemta-5.messagelabs.com id 53/0C-27081-22202735; Tue, 13 May 2014 11:29:38 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1399980576!3948538!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27994 invoked from network); 13 May 2014 11:29:37 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 May 2014 11:29:37 -0000 X-IronPort-AV: E=Sophos; i="4.97,1043,1389744000"; d="scan'208"; a="130584569" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 13 May 2014 11:29:37 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Tue, 13 May 2014 07:29:35 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=localhost.localdomain) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1WkAtq-0004XW-FO; Tue, 13 May 2014 12:29:35 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Tue, 13 May 2014 12:29:34 +0100 From: Ian Campbell To: Date: Tue, 13 May 2014 12:29:25 +0100 Message-ID: <1399980574-12515-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399980488.21867.19.camel@kazak.uk.xensource.com> References: <1399980488.21867.19.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: ian.jackson@eu.citrix.com, julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v4 1/9] tools: libxl: use uint64_t not unsigned long long for addresses X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: 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);