[Xen-changelog] [PATCH] [PATCH] ioemu: enable Cirrus VGA emulation

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1579, 2005/05/28 09:54:28+01:00, leendert@xxxxxxxxxxxxxx

        [PATCH] [PATCH] ioemu: enable Cirrus VGA emulation
        
        At some point the Cirrus VGA driver was commented out. Probably
        for debugging. The patch below adds it back in. It works just fine.
        
        Signed-Off-By: Leendert van Doorn <leendert@xxxxxxxxxxxxxx>



 hw/pc.c                 |    7 ++-----
 hw/vga.c                |    2 +-
 target-i386-dm/Makefile |    1 +
 3 files changed, 4 insertions(+), 6 deletions(-)


diff -Nru a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c       2005-05-28 05:04:20 -04:00
+++ b/tools/ioemu/hw/pc.c       2005-05-28 05:04:20 -04:00
@@ -389,7 +389,7 @@
     linux_boot = (kernel_filename != NULL);
 
     /* allocate RAM */
-//    cpu_register_physical_memory(0, ram_size, 0);
+//  cpu_register_physical_memory(0, ram_size, 0);
 
 #ifndef NOBIOS
     /* BIOS load */
@@ -436,9 +436,9 @@
     /* map all the bios at the top of memory */
     cpu_register_physical_memory((uint32_t)(-bios_size), 
                                  bios_size, bios_offset | IO_MEM_ROM);
+#endif
     
     bochs_bios_init();
-#endif
 
     if (linux_boot) {
         uint8_t bootsect[512];
@@ -508,9 +508,6 @@
 
     register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
 
-#ifdef NOBIOS
-    cirrus_vga_enabled = 0;
-#endif
     if (cirrus_vga_enabled) {
         if (pci_enabled) {
             pci_cirrus_vga_init(pci_bus, 
diff -Nru a/tools/ioemu/hw/vga.c b/tools/ioemu/hw/vga.c
--- a/tools/ioemu/hw/vga.c      2005-05-28 05:04:20 -04:00
+++ b/tools/ioemu/hw/vga.c      2005-05-28 05:04:20 -04:00
@@ -1877,7 +1877,7 @@
 
     /* qemu's vga mem is not detached from phys_ram_base and can cause DM abort
      * when guest write vga mem, so allocate a new one */
-    s->vram_ptr = qemu_mallocz(256 * 1024);
+    s->vram_ptr = qemu_mallocz(vga_ram_size);
 
     s->vram_offset = vga_ram_offset;
     s->vram_size = vga_ram_size;
diff -Nru a/tools/ioemu/target-i386-dm/Makefile 
b/tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile       2005-05-28 05:04:20 -04:00
+++ b/tools/ioemu/target-i386-dm/Makefile       2005-05-28 05:04:20 -04:00
@@ -272,6 +272,7 @@
 # Hardware support
 VL_OBJS+= ide.o ne2000.o pckbd.o vga.o dma.o
 VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o port-e9.o
+VL_OBJS+= cirrus_vga.o
 
 ifeq ($(TARGET_ARCH), ppc)
 VL_OBJS+= ppc.o ide.o ne2000.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog