summaryrefslogtreecommitdiffstats
path: root/hw/mips_malta.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-10 02:24:36 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-10 02:24:36 +0000
commitb584726df971c1238a5249cc21121cf2ebbcaf55 (patch)
tree32b73d21de064d8b3c28750d35608cac701d1863 /hw/mips_malta.c
parenta8b01dd87f3f1cb93d51ce87b13f57fe5415e33e (diff)
downloadhqemu-b584726df971c1238a5249cc21121cf2ebbcaf55.zip
hqemu-b584726df971c1238a5249cc21121cf2ebbcaf55.tar.gz
Clean up VGA ram allocation.
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7063 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r--hw/mips_malta.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 54623ba..9b7cd94 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -769,7 +769,6 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
{
char buf[1024];
ram_addr_t ram_offset;
- ram_addr_t vga_ram_offset;
ram_addr_t bios_offset;
target_long bios_size;
int64_t kernel_entry;
@@ -812,7 +811,6 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
exit(1);
}
ram_offset = qemu_ram_alloc(ram_size);
- vga_ram_offset = qemu_ram_alloc(vga_ram_size);
bios_offset = qemu_ram_alloc(BIOS_SIZE);
@@ -949,14 +947,11 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
/* Optional PCI video card */
if (cirrus_vga_enabled) {
- pci_cirrus_vga_init(pci_bus, phys_ram_base + vga_ram_offset,
- ram_size, vga_ram_size);
+ pci_cirrus_vga_init(pci_bus, vga_ram_size);
} else if (vmsvga_enabled) {
- pci_vmsvga_init(pci_bus, phys_ram_base + vga_ram_offset,
- ram_size, vga_ram_size);
+ pci_vmsvga_init(pci_bus, vga_ram_size);
} else if (std_vga_enabled) {
- pci_vga_init(pci_bus, phys_ram_base + vga_ram_offset,
- ram_size, vga_ram_size, 0, 0);
+ pci_vga_init(pci_bus, vga_ram_size, 0, 0);
}
}
OpenPOWER on IntegriCloud