PowerPC merge

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

diff --git a/vl.c b/vl.c
index 13aa9dfbec5cb65c5ba25b5bd558e54546de323a..85c6623a051ee4d544d4812af81f48c514f0ead5 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -110,11 +110,12 @@ IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS];
 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 @@ int main(int argc, char **argv)
         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 @@ int main(int argc, char **argv)
     }
 
     /* 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

diff --git a/vl.h b/vl.h
index 6bb131cb4ea2cc9db987e5fe5fc1025337b4acae..ebe715f27957cc70b2d35f7d27f0e66dbabbc86f 100644 (file)
--- a/vl.h
+++ b/vl.h
@@ -168,6 +168,15 @@ void vm_start(void);
 void vm_stop(int reason);
 
 extern int audio_enabled;
+extern int ram_size;
+extern int bios_size;
+
+/* XXX: make it dynamic */
+#if defined (TARGET_PPC)
+#define BIOS_SIZE (512 * 1024)
+#else
+#define BIOS_SIZE 0
+#endif
 
 /* async I/O support */