[SerialICE] r76 - trunk/qemu-0.11.0

[svn at coresystems.de]

Author: stepan
Date: 2009-11-27 15:11:42 +0100 (Fri, 27 Nov 2009)
New Revision: 76

Modified:
   trunk/qemu-0.11.0/serialice.c
   trunk/qemu-0.11.0/serialice.h
   trunk/qemu-0.11.0/vl.c
Log:
Trying to get rid of the need for vgabios-cirrus.bin
Doesn't work really well.

Signed-off-by: Stefan Reinauer <stepan at coresystems.de>



Modified: trunk/qemu-0.11.0/serialice.c
===================================================================
--- trunk/qemu-0.11.0/serialice.c	2009-11-26 22:27:27 UTC (rev 75)
+++ trunk/qemu-0.11.0/serialice.c	2009-11-27 14:11:42 UTC (rev 76)
@@ -965,6 +965,15 @@
 
 	/* Let the rest of Qemu know we're alife */
 	serialice_active = 1;
+#if SERIALICE_HIDES_VGA
+	/* Go to Qemu monitor immediately, don't try to open
+	 * vgabios-cirrus.bin, because it's not needed anyways.
+	 *
+	 * This is disabled because the Qemu window is distorted
+	 * until the first console change when this is active
+	 */
+	vga_interface_type = VGA_NONE;
+#endif
 }
 
 void serialice_exit(void)

Modified: trunk/qemu-0.11.0/serialice.h
===================================================================
--- trunk/qemu-0.11.0/serialice.h	2009-11-26 22:27:27 UTC (rev 75)
+++ trunk/qemu-0.11.0/serialice.h	2009-11-27 14:11:42 UTC (rev 76)
@@ -64,4 +64,6 @@
 void serialice_log_load(int caught, uint32_t addr, uint32_t result, unsigned int data_size);
 int serialice_handle_store(uint32_t addr, uint32_t val, unsigned int data_size);
 
+#define SERIALICE_HIDES_VGA 0
+
 #endif

Modified: trunk/qemu-0.11.0/vl.c
===================================================================
--- trunk/qemu-0.11.0/vl.c	2009-11-26 22:27:27 UTC (rev 75)
+++ trunk/qemu-0.11.0/vl.c	2009-11-27 14:11:42 UTC (rev 76)
@@ -2756,6 +2756,13 @@
 {
     DisplayState *ds = qemu_mallocz(sizeof(DisplayState));
     ds->allocator = &default_allocator;
+#ifdef CONFIG_SERIALICE
+#if SERIALICE_HIDES_VGA
+    if (serialice_active)
+        ds->surface = qemu_create_displaysurface(ds, 640, 384);
+    else
+#endif
+#endif
     ds->surface = qemu_create_displaysurface(ds, 640, 480);
     register_displaystate(ds);
 }