[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [qemu-xen-unstable] fix stdvga + videoram config option
commit d086eb683d724aa37199d9be351ae800cf1725ac Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> Date: Thu May 21 18:08:19 2009 +0100 fix stdvga + videoram config option [There is an unfortunate] initial configuration check done by qemu that is actually meaningless for us (at least on x86). This patch should fix the problem. I kept the check in place only in case it might be of some use for the ia64 people. Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> --- vl.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index b5bb5cb..3506977 100644 --- a/vl.c +++ b/vl.c @@ -4801,7 +4801,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; @@ -5654,13 +5653,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])) @@ -5677,6 +5669,14 @@ int main(int argc, char **argv, char **envp) phys_ram_size = (machine->ram_require + vga_ram_size) & ~RAMSIZE_FIXED; +#if defined (__ia64__) + ram_size = vga_ram_size; + 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-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |