diff options
| author | Anthony Liguori | 2011-08-25 14:48:24 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-25 14:48:24 +0200 |
| commit | 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d (patch) | |
| tree | fe43017f2bf431bc55a90b28e6c0e9357c4d46bd /hw/mips_jazz.c | |
| parent | Merge remote-tracking branch 'aneesh/for-upstream-2' into staging (diff) | |
| parent | milkymist: convert to memory API (diff) | |
| download | qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.gz qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.xz qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 84ce0613a3..a74108646c 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -195,7 +195,8 @@ void mips_jazz_init (ram_addr_t ram_size, /* Video card */ switch (jazz_model) { case JAZZ_MAGNUM: - g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); + g364fb_mm_init(get_system_memory(), 0x40000000, 0x60000000, 0, + rc4030[3]); break; case JAZZ_PICA61: isa_vga_mm_init(0x40000000, 0x60000000, 0, get_system_memory()); |