From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 6 Jun 2008 16:38:04 +0000 (+0100)
Subject: Need to actually compile vga.c.
X-Git-Tag: xen-3.3.0-rc1~94
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=773d927bda9484abbfb99fdda972c10796e9de90;p=qemu-xen-unstable.git

Need to actually compile vga.c.
Still one outstanding problem, which is that
vga_save_dpy_resize has the wrong prototype.
---

diff --git a/hw/vga.c b/hw/vga.c
index e791ba2be1..fca220f342 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2163,12 +2163,11 @@ void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
     s->vram_offset = vga_ram_offset;
     s->vram_size = vga_ram_size;
     s->ds = ds;
-    ds->palette = s->last_palette;
     s->get_bpp = vga_get_bpp;
     s->get_offsets = vga_get_offsets;
     s->get_resolution = vga_get_resolution;
     graphic_console_init(s->ds, vga_update_display, vga_invalidate_display,
-                         vga_screen_dump, s);
+                         vga_screen_dump, NULL, s);
 
     vga_bios_init(s);
 }
diff --git a/xen-hooks.mak b/xen-hooks.mak
index 8358054f5a..f058ff1b8c 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -37,7 +37,4 @@ endif
 BAD_OBJS += loader.o gdbstub.o acpi.o apic.o
 BAD_OBJS += vmmouse.o vmport.o tcg* helper.o
 
-# don't compile right now:
-BAD_OBJS += vga.o
-
 OBJS := $(filter-out $(BAD_OBJS), $(OBJS))