From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hxr48-0003Zw-FC
	for qemu-devel@nongnu.org; Mon, 11 Jun 2007 17:04:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hxr46-0003Zk-3K
	for qemu-devel@nongnu.org; Mon, 11 Jun 2007 17:04:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hxr45-0003Zh-U1
	for qemu-devel@nongnu.org; Mon, 11 Jun 2007 17:04:41 -0400
Received: from moutng.kundenserver.de ([212.227.126.179])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <SRS0=odT4=LL=mail.berlios.de=weil@srs.kundenserver.de>)
	id 1Hxr45-0001Bs-67
	for qemu-devel@nongnu.org; Mon, 11 Jun 2007 17:04:41 -0400
Message-ID: <466DB8E8.3040602@mail.berlios.de>
Date: Mon, 11 Jun 2007 23:04:40 +0200
From: Stefan Weil <weil@mail.berlios.de>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [BUG] [PATCH] qemu vl.c vl.h
References: <E1HwTjh-00080G-2q@cvs.savannah.gnu.org>
	<466DB021.1070409@weilnetz.de> <466DB4E5.6090704@mail.berlios.de>
In-Reply-To: <466DB4E5.6090704@mail.berlios.de>
Content-Type: multipart/mixed; boundary="------------060903060807030809040203"
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>

This is a multi-part message in MIME format.
--------------060903060807030809040203
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

One more correction - I hope this is the last one.

Stefan

Stefan Weil schrieb:
> I'm sorry for sending a wrong patch. Here is a corrected version.
> Thank you, Thiemo, for your hint.
>
> Stefan
>
> Stefan Weil schrieb:
>> Removing dumb_display_init introduced a bug for -nographic mode.
>> QEMU crashs when dpy_update (or dpy_resize) is called, because
>> the corresponding function pointers are zero.
>>
>> The patch adds dumb_display_init again (and declares it static
>> because it is only used locally in vl.c).
>>
>> Stefan
>>
>>
>> Thiemo Seufer schrieb:
>>> CVSROOT: /sources/qemu
>>> Module name: qemu
>>> Changes by: Thiemo Seufer <ths> 07/06/08 01:57:57
>>>
>>> Modified files:
>>> . : vl.c vl.h
>>>
>>> Log message:
>>> Don't refresh a graphical screen when it isn't displayed, by Herve
>>> Poussineau.
>>>
>>> CVSWeb URLs:
>>> http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemu&r1=1.304&r2=1.305
>>> http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.249&r2=1.2

--------------060903060807030809040203
Content-Type: text/x-diff;
 name="vl.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="vl.patch"

Index: vl.c
===================================================================
RCS file: /sources/qemu/qemu/vl.c,v
retrieving revision 1.306
diff -u -b -B -r1.306 vl.c
--- vl.c	10 Jun 2007 19:21:04 -0000	1.306
+++ vl.c	11 Jun 2007 21:03:29 -0000
@@ -4482,6 +4482,34 @@
 }
 
 /***********************************************************/
+/* dumb display */
+
+static void dumb_update(DisplayState *ds, int x, int y, int w, int h)
+{
+}
+
+static void dumb_resize(DisplayState *ds, int w, int h)
+{
+}
+
+static void dumb_refresh(DisplayState *ds)
+{
+#if defined(CONFIG_SDL)
+    vga_hw_update();
+#endif
+}
+
+static void dumb_display_init(DisplayState *ds)
+{
+    ds->data = NULL;
+    ds->linesize = 0;
+    ds->depth = 0;
+    ds->dpy_update = dumb_update;
+    ds->dpy_resize = dumb_resize;
+    ds->dpy_refresh = dumb_refresh;
+}
+
+/***********************************************************/
 /* I/O handling */
 
 #define MAX_IO_HANDLERS 64
@@ -7877,7 +7905,8 @@
     /* terminal init */
     memset(&display_state, 0, sizeof(display_state));
     if (nographic) {
-        /* nothing to do */
+        /* nearly nothing to do */
+        dumb_display_init(ds);
     } else if (vnc_display != NULL) {
         vnc_display_init(ds, vnc_display);
     } else {

--------------060903060807030809040203--