Revert 18025:07c7aef164 -- go back to 8MB VRAM.

We may well want it in future anyway, and changing it makes
save/restore compatibility difficult.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index aa26005a8bf3f6745443fa12dfbc5e9203adfd46..c0e2381030a35a40b2de065afeea0cd1da6e994e 100644 (file)
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -927,7 +927,7 @@ extern struct soundhw soundhw[];
 
 /* vga.c */
 
-#define VGA_RAM_SIZE (4096 * 1024)
+#define VGA_RAM_SIZE (8192 * 1024)
 
 /* in ms */
 #define GUI_REFRESH_INTERVAL 30

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 0389f05aac5510df6308552a38f7552f6c85f236..615e56da0fec85bf55bac644c651f13a10bea483 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -833,8 +833,8 @@ class IA64_HVM_ImageHandler(HVMImageHandler):
         # buffer io page, buffer pio page and memmap info page
         extra_pages = 1024 + 5
         mem_kb += extra_pages * page_kb
-        # Add 4 MiB overhead for QEMU's video RAM.
-        return mem_kb + 4096
+        # Add 8 MiB overhead for QEMU's video RAM.
+        return mem_kb + 8192
 
     def getRequiredInitialReservation(self):
         return self.vm.getMemoryTarget()
@@ -876,8 +876,8 @@ class X86_HVM_ImageHandler(HVMImageHandler):
         return rc
 
     def getRequiredAvailableMemory(self, mem_kb):
-        # Add 4 MiB overhead for QEMU's video RAM.
-        return mem_kb + 4096
+        # Add 8 MiB overhead for QEMU's video RAM.
+        return mem_kb + 8192
 
     def getRequiredInitialReservation(self):
         return self.vm.getMemoryTarget()