Commit c5539cb4 authored by Gonglei's avatar Gonglei Committed by Michael Tokarev
Browse files

Fix debug print warning 



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: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 41c23467

hw/i2c/pm_smbus.c

+3 −2
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    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) {

    case SMBHSTSTS:

        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;

        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;

}

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val, 
    Port92State *s = opaque;

    int oldval = s->outport;



    DPRINTF("port92: write 0x%02x\n", val);

    DPRINTF("port92: write 0x%02" PRIx64 "\n", val);

    s->outport = val;

    qemu_set_irq(*s->a20_out, (val >> 1) & 1);

    if ((val & 1) && !(oldval & 1)) {

hw/input/pckbd.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void kbd_write_command(void *opaque, hwaddr addr, 
{

    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

     * 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;



    DPRINTF("kbd: write data=0x%02x\n", val);

    DPRINTF("kbd: write data=0x%02" PRIx64 "\n", val);



    switch(s->write_cmd) {

    case 0:

hw/intc/i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static uint64_t pic_ioport_read(void *opaque, hwaddr addr, 
            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;

}

hw/isa/apm.c

+3 −2
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    APMState *apm = opaque;

    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) {

        apm->apmc = val;
@@ -64,7 +65,7 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr, unsigned size) 
    } else {

        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;

}