diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
| commit | cecd77ae6df060bbe8f0eea6691112097e680a52 (patch) | |
| tree | 4c82bcf59884c6555cb0199a1f96a26a2dfaf83a /hw/serial.c | |
| parent | f9308207040dc4a1484cee459bedaec03645b935 (diff) | |
| parent | 01ed1d527c59356e6c4c9d54b5710a3c9e78ce4e (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By liguang (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
qdev: remove redundant abort()
gitignore: ignore more files
Use proper term in TCG README
serial: Fix debug format strings
Fix typos and misspellings
Advertise --libdir in configure --help output
memory: fix a bug of detection of memory region collision
MinGW: Replace setsockopt by qemu_setsocketopt
Diffstat (limited to 'hw/serial.c')
| -rw-r--r-- | hw/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/serial.c b/hw/serial.c index 48a5eb62b9..0ccc499285 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -306,7 +306,7 @@ static void serial_ioport_write(void *opaque, hwaddr addr, uint64_t val, SerialState *s = opaque; addr &= 7; - DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val); + DPRINTF("write addr=0x%" HWADDR_PRIx " val=0x%" PRIx64 "\n", addr, val); switch(addr) { default: case 0: @@ -527,7 +527,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr addr, unsigned size) ret = s->scr; break; } - DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret); + DPRINTF("read addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr, ret); return ret; } |