diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:37:41 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:37:41 -0500 |
| commit | b85a4ec8a7ce348f3f385a53df4e418f2f54c182 (patch) | |
| tree | c880041590cad24ccb224b3a9fd4c059c845e3e3 /hw | |
| parent | dfebfcf02f74ed47b61841037d7eda1baffb4d6e (diff) | |
| parent | b71706d122838d9656e1a6dae80e22401babdf37 (diff) | |
| download | qemu-b85a4ec8a7ce348f3f385a53df4e418f2f54c182.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write()
ioapic: fix build with DEBUG_IOAPIC
.gitignore: add qemu-bridge-helper and option rom build products
cleanup obsolete typedef
monitor: Remove unused bool field 'qapi' in mon_cmd_t struct
ds1338: Add missing break statement
vnc: Fix packed boolean struct members
Remove type field in ModuleEntry as it's not used
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ds1338.c | 1 | ||||
| -rw-r--r-- | hw/ioapic.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/ds1338.c b/hw/ds1338.c index 6397f0aa6f..d590d9c007 100644 --- a/hw/ds1338.c +++ b/hw/ds1338.c @@ -100,6 +100,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) break; case 5: s->now.tm_mon = from_bcd(data & 0x1f) - 1; + break; case 6: s->now.tm_year = from_bcd(data) + 100; break; diff --git a/hw/ioapic.c b/hw/ioapic.c index 3fee0114d9..e2e4796bb5 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -195,7 +195,7 @@ ioapic_mem_write(void *opaque, target_phys_addr_t addr, uint64_t val, if (size != 4) { break; } - DPRINTF("write: %08x = %08x\n", s->ioregsel, val); + DPRINTF("write: %08x = %08" PRIx64 "\n", s->ioregsel, val); switch (s->ioregsel) { case IOAPIC_REG_ID: s->id = (val >> IOAPIC_ID_SHIFT) & IOAPIC_ID_MASK; |