diff options
| author | Peter Maydell | 2014-09-04 14:33:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-09-04 14:33:53 +0200 |
| commit | 01eb313907dda97313b8fea62e5632fca64f069c (patch) | |
| tree | 16512809a4e1e08b5324d3a5f1e610533f1c32db /hw/isa | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | slirp: Honour vlan/stack in hostfwd_remove commands (diff) | |
| download | qemu-01eb313907dda97313b8fea62e5632fca64f069c.tar.gz qemu-01eb313907dda97313b8fea62e5632fca64f069c.tar.xz qemu-01eb313907dda97313b8fea62e5632fca64f069c.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-03' into staging
trivial patches for 2014-09-03
# gpg: Signature made Wed 03 Sep 2014 06:53:42 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-09-03:
slirp: Honour vlan/stack in hostfwd_remove commands
hmp: fix MemdevList memory leak
qom/object.c, hmp.c: fix string_output_get_string() memory leak
query-memdev: fix potential memory leaks
MAINTAINERS: Add VMWare devices maintainer
device_tree.c: dump all err mesages with error_report
device_tree.c: redirect load_device_tree err message to stderr
scripts: Remove scripts/qtest
Fix debug print warning
curl: The macro that you have to uncomment to get debugging is DEBUG_CURL.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/isa')
| -rw-r--r-- | hw/isa/apm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/isa/apm.c b/hw/isa/apm.c index 054d529b8b..26ab170215 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -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; } |