WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

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

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] ioemu: enable Cirrus VGA emulation
From: Leendert van Doorn <leendert@xxxxxxxxxxxxxx>
Date: Fri, 27 May 2005 15:09:55 -0400
Delivery-date: Fri, 27 May 2005 19:41:36 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: IBM T.J. Watson Research Center
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
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>


diff -ru xeno-unstable.orig/tools/ioemu/hw/pc.c 
xeno-unstable.mine/tools/ioemu/hw/pc.c
--- xeno-unstable.orig/tools/ioemu/hw/pc.c      2005-05-25 07:48:57.000000000 
-0400
+++ xeno-unstable.mine/tools/ioemu/hw/pc.c      2005-05-27 15:23:19.000000000 
-0400
@@ -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, 
Only in xeno-unstable.mine/tools/ioemu/hw: pc.c.orig
diff -ru xeno-unstable.orig/tools/ioemu/hw/vga.c 
xeno-unstable.mine/tools/ioemu/hw/vga.c
--- xeno-unstable.orig/tools/ioemu/hw/vga.c     2005-05-19 23:15:49.000000000 
-0400
+++ xeno-unstable.mine/tools/ioemu/hw/vga.c     2005-05-27 15:34:51.000000000 
-0400
@@ -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;
Only in xeno-unstable.mine/tools/ioemu/hw: vga.c.orig
diff -ru xeno-unstable.orig/tools/ioemu/target-i386-dm/Makefile 
xeno-unstable.mine/tools/ioemu/target-i386-dm/Makefile
--- xeno-unstable.orig/tools/ioemu/target-i386-dm/Makefile      2005-05-25 
07:48:57.000000000 -0400
+++ xeno-unstable.mine/tools/ioemu/target-i386-dm/Makefile      2005-05-27 
15:24:56.000000000 -0400
@@ -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)
Only in xeno-unstable.mine/tools/ioemu/target-i386-dm: Makefile.orig



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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] ioemu: enable Cirrus VGA emulation, Leendert van Doorn <=