stdvga + videoram config option

This is a cherry pick of e0bb6b8df60863bca0163a1688baf4854e931e55 and
its predecessor.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Signed-off-by: Andrew Lyon <andrew.lyon@gmail.com>

diff --git a/vl.c b/vl.c
index 85adc540fc9388b1337900efeab9169e8ce2e067..476d36b7b9214c71b1577f1e0c78754711e0efc0 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4803,7 +4803,6 @@ int main(int argc, char **argv, char **envp)
     machine = first_machine;
     cpu_model = NULL;
     initrd_filename = NULL;
-    ram_size = VGA_RAM_SIZE;
 #ifdef CONFIG_GDBSTUB
     use_gdbstub = 0;
     gdbstub_port = DEFAULT_GDBSTUB_PORT;
@@ -5656,13 +5655,6 @@ int main(int argc, char **argv, char **envp)
     }
 #endif
 
-#if defined (__ia64__)
-    if (ram_size > VGA_IO_START)
-        ram_size += VGA_IO_SIZE; /* skip VGA I/O hole */
-    if (ram_size > MMIO_START)
-        ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
-#endif
-
     /* init the bluetooth world */
     for (i = 0; i < nb_bt_opts; i++)
         if (bt_parse(bt_opts[i]))
@@ -5679,6 +5671,13 @@ int main(int argc, char **argv, char **envp)
 
     phys_ram_size = (machine->ram_require + vga_ram_size) & ~RAMSIZE_FIXED;
 
+#if defined (__ia64__)
+    if (ram_size > VGA_IO_START)
+        ram_size += VGA_IO_SIZE; /* skip VGA I/O hole */
+    if (ram_size > MMIO_START)
+        ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
+#endif
+
     if (machine->ram_require & RAMSIZE_FIXED) {
         if (ram_size > 0) {
             if (ram_size < phys_ram_size) {