[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL trivial 06/11] PPC: dbdma: macio: Fix format specif
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL trivial 06/11] PPC: dbdma: macio: Fix format specifiers (build regression) |
Date: |
Sat, 27 Jul 2013 11:33:21 +0400 |
From: Stefan Weil <address@hidden>
Fix a number of warnings for 32 bit builds (tested on MingW and Linux):
CC hw/ide/macio.o
qemu/hw/ide/macio.c: In function 'pmac_ide_atapi_transfer_cb':
qemu/hw/ide/macio.c:134:9: error: format '%lx' expects argument of type 'long
unsigned int', but argument 3 has type 'hwaddr' [-Werror=format]
qemu/hw/ide/macio.c: In function 'pmac_ide_transfer_cb':
qemu/hw/ide/macio.c:215:5: error: format '%ld' expects argument of type 'long
int', but argument 5 has type 'int64_t' [-Werror=format]
qemu/hw/ide/macio.c:222:9: error: format '%lx' expects argument of type 'long
unsigned int', but argument 3 has type 'hwaddr' [-Werror=format]
qemu/hw/ide/macio.c:264:9: error: format '%lx' expects argument of type 'long
unsigned int', but argument 3 has type 'hwaddr' [-Werror=format]
cc1: all warnings being treated as errors
make: *** [hw/ide/macio.o] Error 1
Signed-off-by: Stefan Weil <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/ide/macio.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 38ad924..ef4ba2b 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -131,7 +131,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int
ret)
int sector_num = (s->lba << 2) + (s->io_buffer_index >> 9);
int nsector = io->len >> 9;
- MACIO_DPRINTF("precopying unaligned %d bytes to %#lx\n",
+ MACIO_DPRINTF("precopying unaligned %d bytes to %#" HWADDR_PRIx "\n",
unaligned, io->addr + io->len - unaligned);
bdrv_read(s->bs, sector_num + nsector, io->remainder, 1);
@@ -212,14 +212,15 @@ static void pmac_ide_transfer_cb(void *opaque, int ret)
s->nsector -= n;
}
- MACIO_DPRINTF("remainder: %d io->len: %d nsector: %d sector_num: %ld\n",
+ MACIO_DPRINTF("remainder: %d io->len: %d nsector: %d "
+ "sector_num: %" PRId64 "\n",
io->remainder_len, io->len, s->nsector, sector_num);
if (io->remainder_len && io->len) {
/* guest wants the rest of its previous transfer */
int remainder_len = MIN(io->remainder_len, io->len);
uint8_t *p = &io->remainder[0x200 - remainder_len];
- MACIO_DPRINTF("copying remainder %d bytes at %#lx\n",
+ MACIO_DPRINTF("copying remainder %d bytes at %#" HWADDR_PRIx "\n",
remainder_len, io->addr);
switch (s->dma_cmd) {
@@ -261,7 +262,7 @@ static void pmac_ide_transfer_cb(void *opaque, int ret)
if (unaligned) {
int nsector = io->len >> 9;
- MACIO_DPRINTF("precopying unaligned %d bytes to %#lx\n",
+ MACIO_DPRINTF("precopying unaligned %d bytes to %#" HWADDR_PRIx "\n",
unaligned, io->addr + io->len - unaligned);
switch (s->dma_cmd) {
--
1.7.10.4
- [Qemu-trivial] [PULL trivial 00/11] trivial patches for 2013-07-27, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 01/11] aes: Remove unused code (NDEBUG, u16), Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 03/11] hw/9pfs: Fix potential memory leak and avoid reuse of freed memory, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 04/11] exec: Remove env from list of poisoned names, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 06/11] PPC: dbdma: macio: Fix format specifiers (build regression),
Michael Tokarev <=
- [Qemu-trivial] [PULL trivial 07/11] linux-user: correct argument number for sys_mremap and sys_splice, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 02/11] timer: make timers_state static, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 05/11] watchdog: Remove break after exit, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 09/11] qemu-options: mention C-a h in the -nographic doc, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 08/11] misc: Fix new typos in comments and strings, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 10/11] misc: Use g_assert_not_reached for code which is expected to be unreachable, Michael Tokarev, 2013/07/27
- [Qemu-trivial] [PULL trivial 11/11] target-mips: Remove assignment to a variable which is never used, Michael Tokarev, 2013/07/27
- Re: [Qemu-trivial] [Qemu-devel] [PULL trivial 00/11] trivial patches for 2013-07-27, Aurelien Jarno, 2013/07/29