[Xen-changelog] [qemu-xen-unstable] stubdom: fix creation hang by not initialising xenfb_pv if nographic

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

commit 109ed219afc4be5cc5c22f912bb125d1fb102bb2
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date:   Tue Jun 29 14:42:48 2010 +0100

    stubdom: fix creation hang by not initialising xenfb_pv if nographic
    
    Contributed-by: Eric Chanudet <eric.chanudet@xxxxxxxxxx>
    Modified-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 vl.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vl.c b/vl.c
index 404d67a..ad8c0d0 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 */
--
generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog