commit 0ced6589701ec3716f7df86dbaf29db154a6a0d7
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun May 23 21:06:12 2004 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun May 23 21:06:12 2004 +0000
tree d41d563f71c13b81b02994ebd93e9e99430fd07f
parent b415a4078d8ddae8338a8ba65206777331022a54

PowerPC merge


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@857 c046a42c-6fe2-441c-8c8c-71466251a162

vl.c

diff --git a/vl.c b/vl.c
index 13aa9df..85c6623 100644
--- a/vl.c
+++ b/vl.c
@@ -110,11 +110,12 @@
 IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS];
 BlockDriverState *bs_table[MAX_DISKS], *fd_table[MAX_FD];
 int vga_ram_size;
+int bios_size;
 static DisplayState display_state;
 int nographic;
 int64_t ticks_per_sec;
 int boot_device = 'c';
-static int ram_size;
+int ram_size;
 static char network_script[1024];
 int pit_min_timer_count = 0;
 int nb_nics;
@@ -2095,6 +2096,7 @@
         hd_filename[i] = NULL;
     ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
     vga_ram_size = VGA_RAM_SIZE;
+    bios_size = BIOS_SIZE;
     pstrcpy(network_script, sizeof(network_script), DEFAULT_NETWORK_SCRIPT);
 #ifdef CONFIG_GDBSTUB
     use_gdbstub = 0;
@@ -2393,7 +2395,7 @@
     }
 
     /* init the memory */
-    phys_ram_size = ram_size + vga_ram_size;
+    phys_ram_size = ram_size + vga_ram_size + bios_size;
 
 #ifdef CONFIG_SOFTMMU
 #ifdef _BSD