commit 3b7d68179f60b98da12fb126e5378bd37bdc4744
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date: Fri Sep 4 15:57:21 2009 +0100
stdvga + videoram config option
This is a cherry pick of e0bb6b8df60863bca0163a1688baf4854e931e55 and
its predecessor.
Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Lyon <andrew.lyon@xxxxxxxxx>
---
vl.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/vl.c b/vl.c
index 85adc54..476d36b 100644
--- 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) {
--
generated by git-patchbot for /home/xen/git/qemu-xen-3.4-testing.git
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home