vbox: Fix starting domains

When starting a VirtualBox domain, we try to guess which frontend
to use. While the whole algorithm looks a bit outdated, it may
happen that we tell VirtualBox to use "gui" frontend, but not
which DISPLAY= to use.

I haven't found any documentation on the algorithm we use, but if
I make us fallback onto DISPLAY=:0 when no other configuration is
found then I'm able to start my guests just fine.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index bd77641d39cb95c77703cb3f69dae43b06e727b5..30a85ce8b2242b61e8c56f47cc4f29584fc3f33c 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -2120,32 +2120,33 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid
     }
     VBOX_UTF8_FREE(valueDisplayUtf8);
 
-    if (guiPresent) {
-        if (guiDisplay) {
-            char *displayutf8;
-            displayutf8 = g_strdup_printf("DISPLAY=%s", guiDisplay);
-            VBOX_UTF8_TO_UTF16(displayutf8, &env);
-            VIR_FREE(displayutf8);
-            VIR_FREE(guiDisplay);
+    if (guiPresent || sdlPresent) {
+        const char *display = NULL;
+        const char *sessType = NULL;
+        char *displayutf8;
+
+        if (guiPresent) {
+            sessType = "gui";
+            display = guiDisplay;
+        } else {
+            sessType = "sdl";
+            display = sdlDisplay;
         }
 
-        VBOX_UTF8_TO_UTF16("gui", &sessionType);
-    }
-
-    if (sdlPresent) {
-        if (sdlDisplay) {
-            char *displayutf8;
-            displayutf8 = g_strdup_printf("DISPLAY=%s", sdlDisplay);
-            VBOX_UTF8_TO_UTF16(displayutf8, &env);
-            VIR_FREE(displayutf8);
-            VIR_FREE(sdlDisplay);
+        if (!display) {
+            /* Provide some sane default */
+            display = ":0";
         }
 
-        VBOX_UTF8_TO_UTF16("sdl", &sessionType);
-    }
+        displayutf8 = g_strdup_printf("DISPLAY=%s", display);
+        VBOX_UTF8_TO_UTF16(displayutf8, &env);
+        VIR_FREE(displayutf8);
+        VIR_FREE(guiDisplay);
 
-    if (vrdpPresent)
+        VBOX_UTF8_TO_UTF16(sessType, &sessionType);
+    } else if (vrdpPresent) {
         VBOX_UTF8_TO_UTF16("vrdp", &sessionType);
+    }
 
     rc = gVBoxAPI.UIMachine.LaunchVMProcess(data, machine, iid,
                                             sessionType, env,