From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Mon, 14 Jul 2008 12:13:26 +0000 (+0100)
Subject: Revert "ioemu: drop unused 4MB video memory"
X-Git-Tag: xen-3.3.0-rc1~38
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2bb0ce87ab73c52997b380bdf4a06eeba1c9f99c;p=qemu-xen-3.3-testing.git

Revert "ioemu: drop unused 4MB video memory"

This reverts commit 2b7a55d6133cae388c0b506ba6f0110bbf9a9318.

This has various compatibility problems, including breaking
restoration of old images.  It is also likely that we will want to
increase this amount in the future.
---

diff --git a/hw/pc.h b/hw/pc.h
index 5a28cd25..a78e0393 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -115,9 +115,7 @@ int piix4_init(PCIBus *bus, int devfn);
 
 /* vga.c */
 
-#if defined(CONFIG_DM)
-#define VGA_RAM_SIZE (4096 * 1024)
-#elif !defined(TARGET_SPARC)
+#ifndef TARGET_SPARC
 #define VGA_RAM_SIZE (8192 * 1024)
 #else
 #define VGA_RAM_SIZE (9 * 1024 * 1024)