From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH 1 of 4] populate guest videoram
Date: Tue, 13 Jan 2009 12:17:51 +0000
Message-ID: <496C866F.8060104@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

This patch applies to xen-unstable and removes the videoram allocation
code from hvmloader, it also moves hvmloader memory base from 0xff000000
to 0xfc000000.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff -r 1dfc48a8c361 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h	Fri Jan 09 15:57:57 2009 +0000
+++ b/tools/firmware/hvmloader/config.h	Fri Jan 09 17:59:04 2009 +0000
@@ -20,7 +20,7 @@
 extern unsigned long pci_mem_start, pci_mem_end;
 
 /* We reserve 16MB at the top of the 4GB memory hole. */
-#define RESERVED_MEMBASE    0xff000000
+#define RESERVED_MEMBASE    0xfc000000
 #define RESERVED_MEMSIZE    0x01000000
 
 #define ROMBIOS_SEG            0xF000
diff -r 1dfc48a8c361 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c	Fri Jan 09 15:57:57 2009 +0000
+++ b/tools/firmware/hvmloader/hvmloader.c	Fri Jan 09 17:59:04 2009 +0000
@@ -644,7 +644,7 @@
 {
     int option_rom_sz = 0, vgabios_sz = 0, etherboot_sz = 0;
     int rombios_sz, smbios_sz;
-    uint32_t etherboot_phys_addr, option_rom_phys_addr, vga_ram = 0;
+    uint32_t etherboot_phys_addr, option_rom_phys_addr;
     uint16_t xen_pfiob;
 
     printf("HVM Loader\n");
@@ -692,12 +692,6 @@
         break;
     }
 
-    if ( virtual_vga != VGA_none )
-    {
-        vga_ram = virt_to_phys(mem_alloc(8 << 20, 4096));
-        printf("VGA RAM at %08x\n", vga_ram);
-    }
-
     etherboot_phys_addr = VGABIOS_PHYSICAL_ADDRESS + vgabios_sz;
     if ( etherboot_phys_addr < OPTIONROM_PHYSICAL_ADDRESS )
         etherboot_phys_addr = OPTIONROM_PHYSICAL_ADDRESS;
@@ -739,8 +733,6 @@
                ROMBIOS_PHYSICAL_ADDRESS + rombios_sz - 1);
 
     xen_pfiob = init_xen_platform_io_base();
-    if ( xen_pfiob && vga_ram )
-        outl(xen_pfiob + 4, vga_ram);
 
     build_e820_table();