diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
| commit | 4c54661feb0437eab99186a0e462524e18592b9c (patch) | |
| tree | 7e2c4969ac479ca13bfacbd569af3c08be103bad /hw/pc.h | |
| parent | 04970fd9339f75f5d21c094ab816a8e429dc1ff1 (diff) | |
| parent | 2f290a8c3db977056e4840810d0dd42032745f21 (diff) | |
| download | focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.gz focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/pc.h')
| -rw-r--r-- | hw/pc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pc.h b/hw/pc.h index 8e75c71cf7..7e6ddbab82 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -118,7 +118,7 @@ void vmmouse_set_data(const uint32_t *data); void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base); void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, - target_phys_addr_t base, ram_addr_t size, + MemoryRegion *region, ram_addr_t size, target_phys_addr_t mask); void i8042_isa_mouse_fake_event(void *opaque); void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out); |