diff options
| author | Richard Henderson <rth@twiddle.net> | 2011-08-10 15:28:17 -0700 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-09-25 14:58:37 +0300 |
| commit | dbff76ac330b61ff304f3d188391ec6824b2ed8b (patch) | |
| tree | f40548425ba6a852e5e9d3bd55a480811dcb3192 /hw/mips_jazz.c | |
| parent | 098d314a3263693ec31e227f4018646e74d439a0 (diff) | |
| download | qemu-dbff76ac330b61ff304f3d188391ec6824b2ed8b.zip qemu-dbff76ac330b61ff304f3d188391ec6824b2ed8b.tar.gz qemu-dbff76ac330b61ff304f3d188391ec6824b2ed8b.tar.bz2 | |
pckbd: Convert to MemoryRegion
Slightly non-obvious with mips_jazz passing in the region
structure to populate.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 2b911c7..ea07d32 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -115,6 +115,7 @@ static void mips_jazz_init(MemoryRegion *address_space, rc4030_dma *dmas; void* rc4030_opaque; MemoryRegion *rtc = g_new(MemoryRegion, 1); + MemoryRegion *i8042 = g_new(MemoryRegion, 1); MemoryRegion *dma_dummy = g_new(MemoryRegion, 1); NICInfo *nd; DeviceState *dev; @@ -258,7 +259,8 @@ static void mips_jazz_init(MemoryRegion *address_space, memory_region_add_subregion(address_space, 0x80004000, rtc); /* Keyboard (i8042) */ - i8042_mm_init(rc4030[6], rc4030[7], 0x80005000, 0x1000, 0x1); + i8042_mm_init(rc4030[6], rc4030[7], i8042, 0x1000, 0x1); + memory_region_add_subregion(address_space, 0x80005000, i8042); /* Serial ports */ if (serial_hds[0]) { |