From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 8 Jun 2009 16:45:42 +0000 (+0100)
Subject: stdvga + videoram config option
X-Git-Tag: xen-3.4.3-rc5-broken~82
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e0bb6b8df60863bca0163a1688baf4854e931e55;p=qemu-xen-3.4-testing.git

stdvga + videoram config option

Without this patch, guests cannot be created on ia64 because of
qemu-dm's error.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
---

diff --git a/vl.c b/vl.c
index 7549a193..d86e49b9 100644
--- a/vl.c
+++ b/vl.c
@@ -5670,7 +5670,6 @@ 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)