diff options
| author | George Dunlap <george.dunlap@eu.citrix.com> | 2013-06-19 13:52:20 +0100 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-06-24 12:20:29 +0100 |
| commit | d23749aaf76330730e0d0d86f2ccfc1effd54e3a (patch) | |
| tree | ceff4dd5620646b7f6494cb6a69ea9eee6939e14 /tools/firmware | |
| parent | a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c (diff) | |
| download | xen-d23749aaf76330730e0d0d86f2ccfc1effd54e3a.tar.gz xen-d23749aaf76330730e0d0d86f2ccfc1effd54e3a.tar.bz2 xen-d23749aaf76330730e0d0d86f2ccfc1effd54e3a.zip | |
hvmloader: Remove all 64-bit print arguments
The printf() available to hvmloader does not handle 64-bit data types;
manually break them down as two 32-bit strings.
v4:
- Make macros for the requisite format and bit shifting
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Stefano Stabellini <stefano.stabellini@citrix.com>
CC: Hanweidong <hanweidong@huawei.com>
CC: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools/firmware')
| -rw-r--r-- | tools/firmware/hvmloader/pci.c | 11 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/util.h | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index c78d4d31e7..c1cb1e9eab 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -290,8 +290,9 @@ void pci_setup(void) if ( (base < resource->base) || (base > resource->max) ) { - printf("pci dev %02x:%x bar %02x size %llx: no space for " - "resource!\n", devfn>>3, devfn&7, bar_reg, bar_sz); + printf("pci dev %02x:%x bar %02x size "PRIllx": no space for " + "resource!\n", devfn>>3, devfn&7, bar_reg, + PRIllx_arg(bar_sz)); continue; } @@ -300,8 +301,10 @@ void pci_setup(void) pci_writel(devfn, bar_reg, bar_data); if (using_64bar) pci_writel(devfn, bar_reg + 4, bar_data_upper); - printf("pci dev %02x:%x bar %02x size %llx: %08x\n", - devfn>>3, devfn&7, bar_reg, bar_sz, bar_data); + printf("pci dev %02x:%x bar %02x size "PRIllx": %08x\n", + devfn>>3, devfn&7, bar_reg, + PRIllx_arg(bar_sz), + bar_data); /* Now enable the memory or I/O mapping. */ diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 791325925f..9ccb905dcb 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -168,6 +168,8 @@ void byte_to_hex(char *digits, uint8_t byte); void uuid_to_string(char *dest, uint8_t *uuid); /* Debug output */ +#define PRIllx "%x%08x" +#define PRIllx_arg(ll) (uint32_t)((ll)>>32), (uint32_t)(ll) int printf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); int vprintf(const char *fmt, va_list ap); |