From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LPEIR-0004NK-Jh
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 05:57:27 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LPEIQ-0004Mj-2c
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 05:57:27 -0500
Received: from [199.232.76.173] (port=47479 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LPEIP-0004MY-Nt
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 05:57:25 -0500
Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:62156
	helo=SMTP.EU.CITRIX.COM)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Stefano.Stabellini@eu.citrix.com>)
	id 1LPEIP-0007Ri-6R
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 05:57:25 -0500
Message-ID: <4975AD3E.8050101@eu.citrix.com>
Date: Tue, 20 Jan 2009 10:53:50 +0000
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
MIME-Version: 1.0
References: <E1LNtzL-0002pj-7r@cvs.savannah.gnu.org>	<4973267B.9010901@juno.dti.ne.jp>	<49734152.7080302@juno.dti.ne.jp>	<49746680.3070400@eu.citrix.com>	<49749B91.6080200@juno.dti.ne.jp>	<49749CB7.1020508@eu.citrix.com>	<4974A593.1020607@codemonkey.ws>	<4974A802.7080506@eu.citrix.com>
	<4974CF8B.5080409@codemonkey.ws>
In-Reply-To: <4974CF8B.5080409@codemonkey.ws>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] Adds null check for DisplayStatus
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-devel@nongnu.org

Allocate a DisplaySurface in dumb_display_init if none else does it.
The DisplaySurface will be used for the qemu monitor, serial and
parallel ports, etc.

Signed-off-by: Andrew May  <acmay@acmay.homeip.net>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/vl.c b/vl.c
index 63d954b..b246e47 100644
--- a/vl.c
+++ b/vl.c
@@ -2778,6 +2778,11 @@ DisplayState *get_displaystate(void)
 static void dumb_display_init(void)
 {
     DisplayState *ds = qemu_mallocz(sizeof(DisplayState));
+    if (ds == NULL) {
+        fprintf(stderr, "dumb_display_init: DisplayState allocation failed\n");
+        exit(1);
+    }
+    ds->surface = qemu_create_displaysurface(640, 480, 32, 640 * 4);
     register_displaystate(ds);
 }