From b22d935dbe097de342aa29114fa2a13614c9e7e2 Mon Sep 17 00:00:00 2001 From: Pritesh Kothari Date: Mon, 14 Sep 2009 17:37:13 +0200 Subject: [PATCH] VBox bug when starting machine from old versions * src/vbox/vbox_tmpl.c: fix a bug where one can't start domains defined with older builds or with empty "FRONTEND/Type" tag in their xml files. --- src/vbox/vbox_tmpl.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 8024243afa..72707106ab 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2850,6 +2850,13 @@ static int vboxDomainCreate(virDomainPtr dom) { vrdpPresent = 1; } + if (!vrdpPresent && !sdlPresent && !guiPresent) { + /* if nothing is selected it means either the machine xml + * file is really old or some values are missing so fallback + */ + guiPresent = 1; + } + data->pFuncs->pfnUtf8Free(valueTypeUtf8); } else { @@ -2882,12 +2889,12 @@ static int vboxDomainCreate(virDomainPtr dom) { data->pFuncs->pfnUtf8ToUtf16("vrdp", &sessionType); } - data->vboxObj->vtbl->OpenRemoteSession(data->vboxObj, - data->vboxSession, - iid, - sessionType, - env, - &progress ); + rc = data->vboxObj->vtbl->OpenRemoteSession(data->vboxObj, + data->vboxSession, + iid, + sessionType, + env, + &progress ); if (NS_FAILED(rc)) { vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, "%s", "openremotesession failed, domain can't be started");