diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 7204dd0e4162a0639add7561428819bdda6e33e3..8228410614d120445a04f42365c2f96def1ca2b0 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2509,3 +2509,47 @@ int vboxDomainShutdown(virDomainPtr dom) { return vboxDomainShutdownFlags(dom, 0); } + +int vboxDomainReboot(virDomainPtr dom, unsigned int flags) +{ + VBOX_OBJECT_CHECK(dom->conn, int, -1); + IMachine *machine = NULL; + vboxIIDUnion iid; + IConsole *console = NULL; + PRUint32 state; + PRBool isAccessible = PR_FALSE; + + virCheckFlags(0, -1); + + if (openSessionForMachine(data, dom->uuid, &iid, &machine, false) < 0) + goto cleanup; + + if (!machine) + goto cleanup; + + gVBoxAPI.UIMachine.GetAccessible(machine, &isAccessible); + if (!isAccessible) + goto cleanup; + + gVBoxAPI.UIMachine.GetState(machine, &state); + + if (gVBoxAPI.machineStateChecker.Running(state)) { + gVBoxAPI.UISession.OpenExisting(data, &iid, machine); + gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); + if (console) { + gVBoxAPI.UIConsole.Reset(console); + VBOX_RELEASE(console); + ret = 0; + } + gVBoxAPI.UISession.Close(data->vboxSession); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine not running, so can't reboot it")); + goto cleanup; + } + + cleanup: + VBOX_RELEASE(machine); + vboxIIDUnalloc(&iid); + return ret; +} diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index c1d6519ffa45250a67268bc36260d80c8e4380b7..bb46b79724169fbd132a99c5b09536f07276aafe 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -933,55 +933,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16, return result; } -static int vboxDomainReboot(virDomainPtr dom, unsigned int flags) -{ - VBOX_OBJECT_CHECK(dom->conn, int, -1); - IMachine *machine = NULL; - vboxIID iid = VBOX_IID_INITIALIZER; - IConsole *console = NULL; - PRUint32 state = MachineState_Null; - PRBool isAccessible = PR_FALSE; - nsresult rc; - - virCheckFlags(0, -1); - - vboxIIDFromUUID(&iid, dom->uuid); - rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine); - if (NS_FAILED(rc)) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), dom->id); - goto cleanup; - } - - if (!machine) - goto cleanup; - - machine->vtbl->GetAccessible(machine, &isAccessible); - if (isAccessible) { - machine->vtbl->GetState(machine, &state); - - if (state == MachineState_Running) { - VBOX_SESSION_OPEN_EXISTING(iid.value, machine); - data->vboxSession->vtbl->GetConsole(data->vboxSession, &console); - if (console) { - console->vtbl->Reset(console); - VBOX_RELEASE(console); - ret = 0; - } - VBOX_SESSION_CLOSE(); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("machine not running, so can't reboot it")); - goto cleanup; - } - } - - cleanup: - VBOX_RELEASE(machine); - vboxIIDUnalloc(&iid); - return ret; -} - static int vboxDomainDestroyFlags(virDomainPtr dom, unsigned int flags) @@ -9898,6 +9849,12 @@ _consolePowerButton(IConsole *console) return console->vtbl->PowerButton(console); } +static nsresult +_consoleReset(IConsole *console) +{ + return console->vtbl->Reset(console); +} + static nsresult _progressWaitForCompletion(IProgress *progress, PRInt32 timeout) { @@ -10424,6 +10381,7 @@ static vboxUniformedIConsole _UIConsole = { .Pause = _consolePause, .Resume = _consoleResume, .PowerButton = _consolePowerButton, + .Reset = _consoleReset, }; static vboxUniformedIProgress _UIProgress = { diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index bf53b27c622142a4a40681876bc8854777666c76..d5c6fb4fba7a99dae1f46540f9ac9ef46adbfcf8 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -240,6 +240,7 @@ typedef struct { nsresult (*Pause)(IConsole *console); nsresult (*Resume)(IConsole *console); nsresult (*PowerButton)(IConsole *console); + nsresult (*Reset)(IConsole *console); } vboxUniformedIConsole; /* Functions for IProgress */ @@ -424,6 +425,7 @@ int vboxDomainSuspend(virDomainPtr dom); int vboxDomainResume(virDomainPtr dom); int vboxDomainShutdownFlags(virDomainPtr dom, unsigned int flags); int vboxDomainShutdown(virDomainPtr dom); +int vboxDomainReboot(virDomainPtr dom, unsigned int flags); /* Version specified functions for installing uniformed API */ void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);