From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: stdvga + videoram config option Date: Thu, 21 May 2009 13:00:13 +0100 Message-ID: <4A15424D.1020507@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Andrew Lyon Cc: Xen-devel List-Id: xen-devel@lists.xenproject.org Andrew Lyon wrote: > I just tried to use the stdvga and videoram options to create a hvm > with 16mb video ram, but it fails to start due to qemu device model > failure: that's due to a stupid 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 --- 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) {