mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
vbox: Rewrite vboxDomainResume
This commit is contained in:
parent
8b89505a20
commit
395ecc456e
@ -2409,3 +2409,50 @@ int vboxDomainSuspend(virDomainPtr dom)
|
|||||||
vboxIIDUnalloc(&iid);
|
vboxIIDUnalloc(&iid);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int vboxDomainResume(virDomainPtr dom)
|
||||||
|
{
|
||||||
|
VBOX_OBJECT_CHECK(dom->conn, int, -1);
|
||||||
|
IMachine *machine = NULL;
|
||||||
|
vboxIIDUnion iid;
|
||||||
|
IConsole *console = NULL;
|
||||||
|
PRUint32 state;
|
||||||
|
PRBool isAccessible = PR_FALSE;
|
||||||
|
|
||||||
|
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.Paused(state)) {
|
||||||
|
/* resume the machine here */
|
||||||
|
gVBoxAPI.UISession.OpenExisting(data, &iid, machine);
|
||||||
|
gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
|
||||||
|
if (console) {
|
||||||
|
gVBoxAPI.UIConsole.Resume(console);
|
||||||
|
VBOX_RELEASE(console);
|
||||||
|
ret = 0;
|
||||||
|
} else {
|
||||||
|
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
||||||
|
_("error while resuming the domain"));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
gVBoxAPI.UISession.Close(data->vboxSession);
|
||||||
|
} else {
|
||||||
|
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
||||||
|
_("machine not paused, so can't resume it"));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
VBOX_RELEASE(machine);
|
||||||
|
vboxIIDUnalloc(&iid);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@ -933,59 +933,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vboxDomainResume(virDomainPtr dom)
|
|
||||||
{
|
|
||||||
VBOX_OBJECT_CHECK(dom->conn, int, -1);
|
|
||||||
IMachine *machine = NULL;
|
|
||||||
vboxIID iid = VBOX_IID_INITIALIZER;
|
|
||||||
IConsole *console = NULL;
|
|
||||||
PRUint32 state = MachineState_Null;
|
|
||||||
nsresult rc;
|
|
||||||
|
|
||||||
PRBool isAccessible = PR_FALSE;
|
|
||||||
|
|
||||||
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_Paused) {
|
|
||||||
/* resume the machine here */
|
|
||||||
VBOX_SESSION_OPEN_EXISTING(iid.value, machine);
|
|
||||||
data->vboxSession->vtbl->GetConsole(data->vboxSession, &console);
|
|
||||||
if (console) {
|
|
||||||
console->vtbl->Resume(console);
|
|
||||||
VBOX_RELEASE(console);
|
|
||||||
ret = 0;
|
|
||||||
} else {
|
|
||||||
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
|
||||||
_("error while resuming the domain"));
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
VBOX_SESSION_CLOSE();
|
|
||||||
} else {
|
|
||||||
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
|
||||||
_("machine not paused, so can't resume it"));
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
VBOX_RELEASE(machine);
|
|
||||||
vboxIIDUnalloc(&iid);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int vboxDomainShutdownFlags(virDomainPtr dom,
|
static int vboxDomainShutdownFlags(virDomainPtr dom,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
@ -9999,6 +9946,12 @@ _consolePause(IConsole *console)
|
|||||||
return console->vtbl->Pause(console);
|
return console->vtbl->Pause(console);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static nsresult
|
||||||
|
_consoleResume(IConsole *console)
|
||||||
|
{
|
||||||
|
return console->vtbl->Resume(console);
|
||||||
|
}
|
||||||
|
|
||||||
static nsresult
|
static nsresult
|
||||||
_progressWaitForCompletion(IProgress *progress, PRInt32 timeout)
|
_progressWaitForCompletion(IProgress *progress, PRInt32 timeout)
|
||||||
{
|
{
|
||||||
@ -10432,6 +10385,11 @@ static bool _machineStateRunning(PRUint32 state)
|
|||||||
return state == MachineState_Running;
|
return state == MachineState_Running;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool _machineStatePaused(PRUint32 state)
|
||||||
|
{
|
||||||
|
return state == MachineState_Paused;
|
||||||
|
}
|
||||||
|
|
||||||
static vboxUniformedPFN _UPFN = {
|
static vboxUniformedPFN _UPFN = {
|
||||||
.Initialize = _pfnInitialize,
|
.Initialize = _pfnInitialize,
|
||||||
.Uninitialize = _pfnUninitialize,
|
.Uninitialize = _pfnUninitialize,
|
||||||
@ -10513,6 +10471,7 @@ static vboxUniformedISession _UISession = {
|
|||||||
static vboxUniformedIConsole _UIConsole = {
|
static vboxUniformedIConsole _UIConsole = {
|
||||||
.SaveState = _consoleSaveState,
|
.SaveState = _consoleSaveState,
|
||||||
.Pause = _consolePause,
|
.Pause = _consolePause,
|
||||||
|
.Resume = _consoleResume,
|
||||||
};
|
};
|
||||||
|
|
||||||
static vboxUniformedIProgress _UIProgress = {
|
static vboxUniformedIProgress _UIProgress = {
|
||||||
@ -10599,6 +10558,7 @@ static uniformedMachineStateChecker _machineStateChecker = {
|
|||||||
.Online = _machineStateOnline,
|
.Online = _machineStateOnline,
|
||||||
.NotStart = _machineStateNotStart,
|
.NotStart = _machineStateNotStart,
|
||||||
.Running = _machineStateRunning,
|
.Running = _machineStateRunning,
|
||||||
|
.Paused = _machineStatePaused,
|
||||||
};
|
};
|
||||||
|
|
||||||
void NAME(InstallUniformedAPI)(vboxUniformedAPI *pVBoxAPI)
|
void NAME(InstallUniformedAPI)(vboxUniformedAPI *pVBoxAPI)
|
||||||
|
@ -238,6 +238,7 @@ typedef struct {
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
nsresult (*SaveState)(IConsole *console, IProgress **progress);
|
nsresult (*SaveState)(IConsole *console, IProgress **progress);
|
||||||
nsresult (*Pause)(IConsole *console);
|
nsresult (*Pause)(IConsole *console);
|
||||||
|
nsresult (*Resume)(IConsole *console);
|
||||||
} vboxUniformedIConsole;
|
} vboxUniformedIConsole;
|
||||||
|
|
||||||
/* Functions for IProgress */
|
/* Functions for IProgress */
|
||||||
@ -341,6 +342,7 @@ typedef struct {
|
|||||||
bool (*Online)(PRUint32 state);
|
bool (*Online)(PRUint32 state);
|
||||||
bool (*NotStart)(PRUint32 state);
|
bool (*NotStart)(PRUint32 state);
|
||||||
bool (*Running)(PRUint32 state);
|
bool (*Running)(PRUint32 state);
|
||||||
|
bool (*Paused)(PRUint32 state);
|
||||||
} uniformedMachineStateChecker;
|
} uniformedMachineStateChecker;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@ -417,6 +419,7 @@ int vboxDomainIsActive(virDomainPtr dom);
|
|||||||
int vboxDomainIsPersistent(virDomainPtr dom);
|
int vboxDomainIsPersistent(virDomainPtr dom);
|
||||||
int vboxDomainIsUpdated(virDomainPtr dom);
|
int vboxDomainIsUpdated(virDomainPtr dom);
|
||||||
int vboxDomainSuspend(virDomainPtr dom);
|
int vboxDomainSuspend(virDomainPtr dom);
|
||||||
|
int vboxDomainResume(virDomainPtr dom);
|
||||||
|
|
||||||
/* Version specified functions for installing uniformed API */
|
/* Version specified functions for installing uniformed API */
|
||||||
void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
|
void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user