From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 21 Jan 2009 18:58:51 +0000 (+0000)
Subject: Adds null check for DisplayStatus (Stefano Stabellini)
X-Git-Tag: stefano.display-merge-end~54
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7da03b1d2622a66b033544e16d82d16d8a49568c;p=qemu-xen-3.4-testing.git

Adds null check for DisplayStatus (Stefano Stabellini)

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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6387 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/vl.c b/vl.c
index 63d954bb..b246e47a 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);
 }