Message ID | 1345703083-25322-2-git-send-email-mmogilvi_qemu@miniinfo.net |
---|---|
State | New |
Headers | show |
Hi, Am 23.08.2012 08:24, schrieb Matthew Ogilvie: > These are normally ifdefed out and don't matter. But if you enable > them, they ought to be correct. > > Signed-off-by: Matthew Ogilvie <mmogilvi_qemu@miniinfo.net> > --- > > This version of the patch adds i8259.c. > > An alternative approach might be to eliminate these printf's, > and/or replace them with trace*() calls, but until someone gets > around to doing so... > > hw/cirrus_vga.c | 4 ++-- > hw/i8259.c | 3 ++- > hw/ide/cmd646.c | 5 +++-- > hw/ide/via.c | 5 +++-- > 4 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c > index e8dcc6b..909899d 100644 > --- a/hw/cirrus_vga.c > +++ b/hw/cirrus_vga.c > @@ -2055,8 +2055,8 @@ static void cirrus_vga_mem_write(void *opaque, > } > } else { > #ifdef DEBUG_CIRRUS > - printf("cirrus: mem_writeb " TARGET_FMT_plx " value %02x\n", addr, > - mem_value); > + printf("cirrus: mem_writeb " TARGET_FMT_plx " value %" PRIx64 "\n", > + addr, mem_value); This one is dropping 02. The other ones looks okay on brief look (declaration of "value" invisible). Regards, Andreas > #endif > } > } > diff --git a/hw/i8259.c b/hw/i8259.c > index 53daf78..6587666 100644 > --- a/hw/i8259.c > +++ b/hw/i8259.c > @@ -355,7 +355,8 @@ static uint64_t pic_ioport_read(void *opaque, target_phys_addr_t addr, > ret = s->imr; > } > } > - DPRINTF("read: addr=0x%02x val=0x%02x\n", addr, ret); > + DPRINTF("read: addr=0x%02" TARGET_PRIxPHYS " val=0x%02x\n", > + addr, ret); > return ret; > } > > diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c > index e0b9443..dd2855e 100644 > --- a/hw/ide/cmd646.c > +++ b/hw/ide/cmd646.c > @@ -154,7 +154,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, > break; > } > #ifdef DEBUG_IDE > - printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); > + printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); > #endif > return val; > } > @@ -170,7 +170,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, > } > > #ifdef DEBUG_IDE > - printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); > + printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", > + addr, val); > #endif > switch(addr & 3) { > case 0: > diff --git a/hw/ide/via.c b/hw/ide/via.c > index b20e4f0..948a469 100644 > --- a/hw/ide/via.c > +++ b/hw/ide/via.c > @@ -55,7 +55,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, > break; > } > #ifdef DEBUG_IDE > - printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); > + printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); > #endif > return val; > } > @@ -70,7 +70,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, > } > > #ifdef DEBUG_IDE > - printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); > + printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", > + addr, val); > #endif > switch (addr & 3) { > case 0: >
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index e8dcc6b..909899d 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2055,8 +2055,8 @@ static void cirrus_vga_mem_write(void *opaque, } } else { #ifdef DEBUG_CIRRUS - printf("cirrus: mem_writeb " TARGET_FMT_plx " value %02x\n", addr, - mem_value); + printf("cirrus: mem_writeb " TARGET_FMT_plx " value %" PRIx64 "\n", + addr, mem_value); #endif } } diff --git a/hw/i8259.c b/hw/i8259.c index 53daf78..6587666 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -355,7 +355,8 @@ static uint64_t pic_ioport_read(void *opaque, target_phys_addr_t addr, ret = s->imr; } } - DPRINTF("read: addr=0x%02x val=0x%02x\n", addr, ret); + DPRINTF("read: addr=0x%02" TARGET_PRIxPHYS " val=0x%02x\n", + addr, ret); return ret; } diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index e0b9443..dd2855e 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -154,7 +154,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, break; } #ifdef DEBUG_IDE - printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); #endif return val; } @@ -170,7 +170,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, } #ifdef DEBUG_IDE - printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", + addr, val); #endif switch(addr & 3) { case 0: diff --git a/hw/ide/via.c b/hw/ide/via.c index b20e4f0..948a469 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -55,7 +55,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, break; } #ifdef DEBUG_IDE - printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); #endif return val; } @@ -70,7 +70,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, } #ifdef DEBUG_IDE - printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", + addr, val); #endif switch (addr & 3) { case 0:
These are normally ifdefed out and don't matter. But if you enable them, they ought to be correct. Signed-off-by: Matthew Ogilvie <mmogilvi_qemu@miniinfo.net> --- This version of the patch adds i8259.c. An alternative approach might be to eliminate these printf's, and/or replace them with trace*() calls, but until someone gets around to doing so... hw/cirrus_vga.c | 4 ++-- hw/i8259.c | 3 ++- hw/ide/cmd646.c | 5 +++-- hw/ide/via.c | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-)