diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:09:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:09:02 -0500 |
| commit | 057643f6c4751651ab640edb9b445cb3816edffc (patch) | |
| tree | 31ba8fd4a0a24d08474ba568a0fd0cfe34a3644e /hw | |
| parent | 9f047b8948f43dddb0ee2a391939999fab13eaf4 (diff) | |
| parent | ca8a277ccc911ce8501b1bc984a09f988379d8c3 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/gt64xxx.c | 13 | ||||
| -rw-r--r-- | hw/lsi53c895a.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 1c3425372a..432683acea 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -275,8 +275,9 @@ static void gt64120_isd_mapping(GT64120State *s) check_reserved_space(&start, &length); length = 0x1000; /* Map new address */ - DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx" -> "TARGET_FMT_plx"@"TARGET_FMT_plx", %x\n", s->ISD_length, s->ISD_start, - length, start, s->ISD_handle); + DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx + " -> "TARGET_FMT_plx"@"TARGET_FMT_plx"\n", + s->ISD_length, s->ISD_start, length, start); s->ISD_start = start; s->ISD_length = length; memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem); @@ -543,19 +544,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr, /* not really implemented */ s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe)); s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe); - DPRINTF("INTRCAUSE %x\n", val); + DPRINTF("INTRCAUSE %" PRIx64 "\n", val); break; case GT_INTRMASK: s->regs[saddr] = val & 0x3c3ffffe; - DPRINTF("INTRMASK %x\n", val); + DPRINTF("INTRMASK %" PRIx64 "\n", val); break; case GT_PCI0_ICMASK: s->regs[saddr] = val & 0x03fffffe; - DPRINTF("ICMASK %x\n", val); + DPRINTF("ICMASK %" PRIx64 "\n", val); break; case GT_PCI0_SERR0MASK: s->regs[saddr] = val & 0x0000003f; - DPRINTF("SERR0MASK %x\n", val); + DPRINTF("SERR0MASK %" PRIx64 "\n", val); break; /* Reserved when only PCI_0 is configured. */ diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 75a03a74b9..e077ec07cc 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -697,7 +697,7 @@ static int lsi_queue_req(LSIState *s, SCSIRequest *req, uint32_t len) lsi_reselect(s, p); return 0; } else { - DPRINTF("Queueing IO tag=0x%x\n", tag); + DPRINTF("Queueing IO tag=0x%x\n", p->tag); p->pending = len; return 1; } |