vbox: Rewrite vboxDomainShutdownFlags

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 1219c3a43c4f9ec0ecb56a9b5d6499aabb831e08..d0a658693727619d6f0e82430496f967a78521ee 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -2456,3 +2456,51 @@ int vboxDomainResume(virDomainPtr dom)
     vboxIIDUnalloc(&iid);
     return ret;
 }
+
+int vboxDomainShutdownFlags(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.Paused(state)) {
+        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                       _("machine paused, so can't power it down"));
+        goto cleanup;
+    } else if (gVBoxAPI.machineStateChecker.PoweredOff(state)) {
+        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                       _("machine already powered down"));
+        goto cleanup;
+    }
+
+    gVBoxAPI.UISession.OpenExisting(data, &iid, machine);
+    gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
+    if (console) {
+        gVBoxAPI.UIConsole.PowerButton(console);
+        VBOX_RELEASE(console);
+        ret = 0;
+    }
+    gVBoxAPI.UISession.Close(data->vboxSession);
+
+ cleanup:
+    VBOX_RELEASE(machine);
+    vboxIIDUnalloc(&iid);
+    return ret;
+}

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 988a772885bff3b1a9ac54131b70ad74a009458d..541eef432e1254eb1335c4c329ae0fe3a25a13c0 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -933,60 +933,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
     return result;
 }
 
-static int vboxDomainShutdownFlags(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_Paused) {
-            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                           _("machine paused, so can't power it down"));
-            goto cleanup;
-        } else if (state == MachineState_PoweredOff) {
-            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                           _("machine already powered down"));
-            goto cleanup;
-        }
-
-        VBOX_SESSION_OPEN_EXISTING(iid.value, machine);
-        data->vboxSession->vtbl->GetConsole(data->vboxSession, &console);
-        if (console) {
-            console->vtbl->PowerButton(console);
-            VBOX_RELEASE(console);
-            ret = 0;
-        }
-        VBOX_SESSION_CLOSE();
-    }
-
- cleanup:
-    VBOX_RELEASE(machine);
-    vboxIIDUnalloc(&iid);
-    return ret;
-}
-
 static int vboxDomainShutdown(virDomainPtr dom)
 {
     return vboxDomainShutdownFlags(dom, 0);
@@ -9952,6 +9898,12 @@ _consoleResume(IConsole *console)
     return console->vtbl->Resume(console);
 }
 
+static nsresult
+_consolePowerButton(IConsole *console)
+{
+    return console->vtbl->PowerButton(console);
+}
+
 static nsresult
 _progressWaitForCompletion(IProgress *progress, PRInt32 timeout)
 {
@@ -10390,6 +10342,11 @@ static bool _machineStatePaused(PRUint32 state)
     return state == MachineState_Paused;
 }
 
+static bool _machineStatePoweredOff(PRUint32 state)
+{
+    return state == MachineState_PoweredOff;
+}
+
 static vboxUniformedPFN _UPFN = {
     .Initialize = _pfnInitialize,
     .Uninitialize = _pfnUninitialize,
@@ -10472,6 +10429,7 @@ static vboxUniformedIConsole _UIConsole = {
     .SaveState = _consoleSaveState,
     .Pause = _consolePause,
     .Resume = _consoleResume,
+    .PowerButton = _consolePowerButton,
 };
 
 static vboxUniformedIProgress _UIProgress = {
@@ -10559,6 +10517,7 @@ static uniformedMachineStateChecker _machineStateChecker = {
     .NotStart = _machineStateNotStart,
     .Running = _machineStateRunning,
     .Paused = _machineStatePaused,
+    .PoweredOff = _machineStatePoweredOff,
 };
 
 void NAME(InstallUniformedAPI)(vboxUniformedAPI *pVBoxAPI)

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index b370e4f2bced054e5a3d17503db8238fd11041cd..bfd53395afd3937e9a7d1381b57d32731c8a64fc 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -239,6 +239,7 @@ typedef struct {
     nsresult (*SaveState)(IConsole *console, IProgress **progress);
     nsresult (*Pause)(IConsole *console);
     nsresult (*Resume)(IConsole *console);
+    nsresult (*PowerButton)(IConsole *console);
 } vboxUniformedIConsole;
 
 /* Functions for IProgress */
@@ -343,6 +344,7 @@ typedef struct {
     bool (*NotStart)(PRUint32 state);
     bool (*Running)(PRUint32 state);
     bool (*Paused)(PRUint32 state);
+    bool (*PoweredOff)(PRUint32 state);
 } uniformedMachineStateChecker;
 
 typedef struct {
@@ -420,6 +422,7 @@ int vboxDomainIsPersistent(virDomainPtr dom);
 int vboxDomainIsUpdated(virDomainPtr dom);
 int vboxDomainSuspend(virDomainPtr dom);
 int vboxDomainResume(virDomainPtr dom);
+int vboxDomainShutdownFlags(virDomainPtr dom, unsigned int flags);
 
 /* Version specified functions for installing uniformed API */
 void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);