summaryrefslogtreecommitdiffstats
path: root/hw/pc.h
diff options
context:
space:
mode:
authorAnthony Liguori2011-09-26 15:00:40 +0200
committerAnthony Liguori2011-09-26 15:00:40 +0200
commit4c54661feb0437eab99186a0e462524e18592b9c (patch)
tree7e2c4969ac479ca13bfacbd569af3c08be103bad /hw/pc.h
parentMerge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging (diff)
parentfdc: Convert isabus_fdc_init1 to MemoryRegion (diff)
downloadqemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.gz
qemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.xz
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.h2
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);