From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 29 Jun 2010 13:42:48 +0000 (+0100)
Subject: stubdom: fix creation hang by not initialising xenfb_pv if nographic
X-Git-Tag: anthony.last_qemu_master^0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=109ed219afc4be5cc5c22f912bb125d1fb102bb2;p=qemu-xen-4.5-testing.git

stubdom: fix creation hang by not initialising xenfb_pv if nographic

Contributed-by: Eric Chanudet <eric.chanudet@citrix.com>
Modified-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/vl.c b/vl.c
index 404d67a67..ad8c0d02b 100644
--- a/vl.c
+++ b/vl.c
@@ -5967,16 +5967,16 @@ int main(int argc, char **argv, char **envp)
     /* just use the first displaystate for the moment */
     ds = display_state;
     /* terminal init */
-#ifdef CONFIG_STUBDOM
-    if (xenfb_pv_display_init(ds) == 0) {
-    } else
-#endif
     if (nographic) {
         if (curses) {
             fprintf(stderr, "fatal: -nographic can't be used with -curses\n");
             exit(1);
         }
     } else { 
+#ifdef CONFIG_STUBDOM
+        if (xenfb_pv_display_init(ds) == 0) {
+        } else
+#endif
 #if defined(CONFIG_CURSES)
             if (curses) {
                 /* At the moment curses cannot be used with other displays */