vbox: Rewrite vboxConnectNumOfDefinedDomains

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 2010f4390c2fede75ef4090fcf30a39b8dec5945..0741ff732f2689072239a53a86ccfeff0978a1ef 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3993,3 +3993,43 @@ int vboxConnectListDefinedDomains(virConnectPtr conn,
     gVBoxAPI.UArray.vboxArrayRelease(&machines);
     return ret;
 }
+
+int vboxConnectNumOfDefinedDomains(virConnectPtr conn)
+{
+    VBOX_OBJECT_CHECK(conn, int, -1);
+    vboxArray machines = VBOX_ARRAY_INITIALIZER;
+    PRUint32 state;
+    nsresult rc;
+    size_t i;
+
+    rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj,
+                                      ARRAY_GET_MACHINES);
+    if (NS_FAILED(rc)) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not get number of Defined Domains, rc=%08x"),
+                       (unsigned)rc);
+        goto cleanup;
+    }
+
+    ret = 0;
+    for (i = 0; i < machines.count; ++i) {
+        PRBool isAccessible = PR_FALSE;
+        IMachine *machine = machines.items[i];
+
+        if (!machine)
+            continue;
+
+        gVBoxAPI.UIMachine.GetAccessible(machine, &isAccessible);
+        if (!isAccessible)
+            continue;
+
+        gVBoxAPI.UIMachine.GetState(machine, &state);
+        if (gVBoxAPI.machineStateChecker.Inactive(state)) {
+            ret++;
+        }
+    }
+
+ cleanup:
+    gVBoxAPI.UArray.vboxArrayRelease(&machines);
+    return ret;
+}

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 1efaa0ecf3b29ff34fadfafa32e028caf450c34f..f626cda153f20c9d7a68d4be65ab999064d9c3ee 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -967,44 +967,6 @@ static virDomainState _vboxConvertState(PRUint32 state)
     }
 }
 
-static int vboxConnectNumOfDefinedDomains(virConnectPtr conn)
-{
-    VBOX_OBJECT_CHECK(conn, int, -1);
-    vboxArray machines = VBOX_ARRAY_INITIALIZER;
-    PRUint32 state       = MachineState_Null;
-    nsresult rc;
-    size_t i;
-
-    rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines);
-    if (NS_FAILED(rc)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Could not get number of Defined Domains, rc=%08x"),
-                       (unsigned)rc);
-        goto cleanup;
-    }
-
-    ret = 0;
-    for (i = 0; i < machines.count; ++i) {
-        IMachine *machine = machines.items[i];
-
-        if (machine) {
-            PRBool isAccessible = PR_FALSE;
-            machine->vtbl->GetAccessible(machine, &isAccessible);
-            if (isAccessible) {
-                machine->vtbl->GetState(machine, &state);
-                if ((state < MachineState_FirstOnline) ||
-                    (state > MachineState_LastOnline)) {
-                    ret++;
-                }
-            }
-        }
-    }
-
- cleanup:
-    vboxArrayRelease(&machines);
-    return ret;
-}
-
 #if VBOX_API_VERSION < 3001000
 
 static void

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 7ff6b577609a9573ac07e12d0b53c040cbaba2c4..f57eaa952a23dfd50336ea643d3baea1c0e02759 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -520,6 +520,7 @@ int vboxDomainGetMaxVcpus(virDomainPtr dom);
 char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags);
 int vboxConnectListDefinedDomains(virConnectPtr conn,
                                   char ** const names, int maxnames);
+int vboxConnectNumOfDefinedDomains(virConnectPtr conn);
 
 /* Version specified functions for installing uniformed API */
 void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);