mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug print warning

Browse Source 
Steps:

1.enable qemu debug print, using simply scprit as below:
 grep "//#define DEBUG" * -rl | xargs sed -i "s/\/\/#define DEBUG/#define DEBUG/g"
2. make -j
3. get some warning:
hw/i2c/pm_smbus.c: In function 'smb_ioport_writeb':
hw/i2c/pm_smbus.c:142: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'hwaddr'
hw/i2c/pm_smbus.c:142: warning: format '%02x' expects type 'unsigned int', but argument 3 has type 'uint64_t'
hw/i2c/pm_smbus.c: In function 'smb_ioport_readb':
hw/i2c/pm_smbus.c:209: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'hwaddr'
hw/intc/i8259.c: In function 'pic_ioport_read':
hw/intc/i8259.c:373: warning: format '%02x' expects type 'unsigned int', but argument 2 has type 'hwaddr'
hw/input/pckbd.c: In function 'kbd_write_command':
hw/input/pckbd.c:232: warning: format '%02x' expects type 'unsigned int', but argument 2 has type 'uint64_t'
hw/input/pckbd.c: In function 'kbd_write_data':
hw/input/pckbd.c:333: warning: format '%02x' expects type 'unsigned int', but argument 2 has type 'uint64_t'
hw/isa/apm.c: In function 'apm_ioport_writeb':
hw/isa/apm.c:44: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'hwaddr'
hw/isa/apm.c:44: warning: format '%02x' expects type 'unsigned int', but argument 3 has type 'uint64_t'
hw/isa/apm.c: In function 'apm_ioport_readb':
hw/isa/apm.c:67: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'hwaddr'
hw/timer/mc146818rtc.c: In function 'cmos_ioport_write':
hw/timer/mc146818rtc.c:394: warning: format '%02x' expects type 'unsigned int', but argument 3 has type 'uint64_t'
hw/i386/pc.c: In function 'port92_write':
hw/i386/pc.c:479: warning: format '%02x' expects type 'unsigned int', but argument 2 has type 'uint64_t'

Fix them.

Cc: qemu-trivial@nongnu.org
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Gonglei 2014-08-25 10:01:27 +08:00 committed by Michael Tokarev
parent 41c2346716
commit c5539cb426
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/i2c/pm_smbus.c
View File

@ -139,7 +139,8 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
{ {
PMSMBus *s = opaque; PMSMBus *s = opaque;
SMBUS_DPRINTF("SMB writeb port=0x%04x val=0x%02x\n", addr, val); SMBUS_DPRINTF("SMB writeb port=0x%04" HWADDR_PRIx
" val=0x%02" PRIx64 "\n", addr, val);
switch(addr) { switch(addr) {
case SMBHSTSTS: case SMBHSTSTS:
s->smb_stat = (~(val & 0xff)) & s->smb_stat; s->smb_stat = (~(val & 0xff)) & s->smb_stat;
@ -206,7 +207,7 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width)
val = 0; val = 0;
break; break;
} }
SMBUS_DPRINTF("SMB readb port=0x%04x val=0x%02x\n", addr, val); SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", addr, val);
return val; return val;
} }

2
hw/i386/pc.c
View File

@ -481,7 +481,7 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val,
Port92State *s = opaque; Port92State *s = opaque;
int oldval = s->outport; int oldval = s->outport;
DPRINTF("port92: write 0x%02x\n", val); DPRINTF("port92: write 0x%02" PRIx64 "\n", val);
s->outport = val; s->outport = val;
qemu_set_irq(*s->a20_out, (val >> 1) & 1); qemu_set_irq(*s->a20_out, (val >> 1) & 1);
if ((val & 1) && !(oldval & 1)) { if ((val & 1) && !(oldval & 1)) {

4
hw/input/pckbd.c
View File

@ -229,7 +229,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,
{ {
KBDState *s = opaque; KBDState *s = opaque;
DPRINTF("kbd: write cmd=0x%02x\n", val); DPRINTF("kbd: write cmd=0x%02" PRIx64 "\n", val);
/* Bits 3-0 of the output port P2 of the keyboard controller may be pulsed /* Bits 3-0 of the output port P2 of the keyboard controller may be pulsed
* low for approximately 6 micro seconds. Bits 3-0 of the KBD_CCMD_PULSE * low for approximately 6 micro seconds. Bits 3-0 of the KBD_CCMD_PULSE
@ -330,7 +330,7 @@ static void kbd_write_data(void *opaque, hwaddr addr,
{ {
KBDState *s = opaque; KBDState *s = opaque;
DPRINTF("kbd: write data=0x%02x\n", val); DPRINTF("kbd: write data=0x%02" PRIx64 "\n", val);
switch(s->write_cmd) { switch(s->write_cmd) {
case 0: case 0:

2
hw/intc/i8259.c
View File

@ -370,7 +370,7 @@ static uint64_t pic_ioport_read(void *opaque, hwaddr addr,
ret = s->imr; ret = s->imr;
} }
} }
DPRINTF("read: addr=0x%02x val=0x%02x\n", addr, ret); DPRINTF("read: addr=0x%02" HWADDR_PRIx " val=0x%02x\n", addr, ret);
return ret; return ret;
} }

5
hw/isa/apm.c
View File

@ -41,7 +41,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
{ {
APMState *apm = opaque; APMState *apm = opaque;
addr &= 1; addr &= 1;
APM_DPRINTF("apm_ioport_writeb addr=0x%x val=0x%02x\n", addr, val); APM_DPRINTF("apm_ioport_writeb addr=0x%" HWADDR_PRIx
" val=0x%02" PRIx64 "\n", addr, val);
if (addr == 0) { if (addr == 0) {
apm->apmc = val; apm->apmc = val;
@ -64,7 +65,7 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr, unsigned size)
} else { } else {
val = apm->apms; val = apm->apms;
} }
APM_DPRINTF("apm_ioport_readb addr=0x%x val=0x%02x\n", addr, val); APM_DPRINTF("apm_ioport_readb addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr, val);
return val; return val;
} }

2
hw/timer/mc146818rtc.c
View File

@ -391,7 +391,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr,
if ((addr & 1) == 0) { if ((addr & 1) == 0) {
s->cmos_index = data & 0x7f; s->cmos_index = data & 0x7f;
} else { } else {
CMOS_DPRINTF("cmos: write index=0x%02x val=0x%02x\n", CMOS_DPRINTF("cmos: write index=0x%02x val=0x%02" PRIx64 "\n",
s->cmos_index, data); s->cmos_index, data);
switch(s->cmos_index) { switch(s->cmos_index) {
case RTC_SECONDS_ALARM: case RTC_SECONDS_ALARM: