From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel De Graaf Subject: [PATCH v2] flask: Fix 32-bit compilation of label-pci tool Date: Mon, 5 Dec 2011 06:34:45 -0500 Message-ID: <1323084885-7531-1-git-send-email-dgdegra@tycho.nsa.gov> References: <4EDC9C2D02000078000655D1@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4EDC9C2D02000078000655D1@nat28.tlf.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser Cc: Daniel De Graaf , xen-devel@lists.xensource.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org The 32-bit tools need to support 64-bit addresses, so use the correct printf/scanf formats. Signed-off-by: Daniel De Graaf --- tools/flask/utils/label-pci.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/flask/utils/label-pci.c b/tools/flask/utils/label-pci.c index 839ad61..009a733 100644 --- a/tools/flask/utils/label-pci.c +++ b/tools/flask/utils/label-pci.c @@ -15,6 +15,7 @@ #include #include #include +#include #include /* Pulled from linux/include/linux/ioport.h */ @@ -76,22 +77,22 @@ int main (int argCnt, char *argv[]) goto done; } - while (fscanf(f, "0x%lx 0x%lx 0x%lx\n", &start, &end, &flags) == 3) { + while (fscanf(f, "0x%"SCNx64" 0x%"SCNx64" 0x%"SCNx64"\n", &start, &end, &flags) == 3) { if (flags & IORESOURCE_IO) { - // printf("Port %lx-%lx\n", start, end); + // printf("Port %"PRIx64"-%"PRIx64"\n", start, end); ret = flask_add_ioport(xch, start, end, argv[2]); if (ret) { - fprintf(stderr, "flask_add_ioport %lx-%lx failed: %d\n", + fprintf(stderr, "flask_add_ioport %"PRIx64"-%"PRIx64" failed: %d\n", start, end, ret); err = 2; } } else if (flags & IORESOURCE_MEM) { start >>= 12; end >>= 12; - // printf("IOMEM %lx-%lx\n", start, end); + // printf("IOMEM %"PRIx64"-%"PRIx64"\n", start, end); ret = flask_add_iomem(xch, start, end, argv[2]); if (ret) { - fprintf(stderr, "flask_add_iomem %lx-%lx failed: %d\n", + fprintf(stderr, "flask_add_iomem %"PRIx64"-%"PRIx64" failed: %d\n", start, end, ret); err = 2; } @@ -105,11 +106,11 @@ int main (int argCnt, char *argv[]) if (!f) goto done; start = 0; - fscanf(f, "%ld", &start); + fscanf(f, "%" SCNu64, &start); if (start) { ret = flask_add_pirq(xch, start, argv[2]); if (ret) { - fprintf(stderr, "flask_add_pirq %ld failed: %d\n", + fprintf(stderr, "flask_add_pirq %"PRIu64" failed: %d\n", start, ret); err = 2; } -- 1.7.7.3