]> xenbits.xensource.com Git - qemu-xen-unstable.git/commitdiff
Initialise vga_ram_addr to 0.
authorIan Jackson <iwj@mariner.uk.xensource.com>
Mon, 2 Jun 2008 14:37:15 +0000 (15:37 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 2 Jun 2008 14:37:15 +0000 (15:37 +0100)
This is not used in the Xen case.  In xen-unstable NULL is passed
directly in the calls to the various vga_init functions; in this
version we set vga_ram_addr to 0 as that's textually a smaller change.

hw/pc.c

diff --git a/hw/pc.c b/hw/pc.c
index c33c38d237870263120f2c301f4325fcc21d9aa7..05fd047b09e8221e9abb3408bc70725dd2793883 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -906,6 +906,8 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
     /* map all the bios at the top of memory */
     cpu_register_physical_memory((uint32_t)(-bios_size),
                                  bios_size, bios_offset | IO_MEM_ROM);
+#else
+    vga_ram_addr = 0; /* this is not supposed to be used */
 #endif /* !CONFIG_DM */
 
     bochs_bios_init();