From 773d927bda9484abbfb99fdda972c10796e9de90 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 6 Jun 2008 17:38:04 +0100 Subject: [PATCH] Need to actually compile vga.c. Still one outstanding problem, which is that vga_save_dpy_resize has the wrong prototype. --- hw/vga.c | 3 +-- xen-hooks.mak | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index e791ba2be..fca220f34 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 8358054f5..f058ff1b8 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)) -- 2.39.5