[libvirt] [PATCH 5/8] test: group domain APIs together

[Peter Krempa]

The test driver groups the API groups together, but some domain APIs
were scattered around.
---
 src/test/test_driver.c | 225 +++++++++++++++++++++++++------------------------
 1 file changed, 113 insertions(+), 112 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 20d3c71..59e2031 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3231,6 +3231,119 @@ static int testDomainInterfaceStats(virDomainPtr domain,
     return ret;
 }

+static int testConnectListAllDomains(virConnectPtr conn,
+                                     virDomainPtr **domains,
+                                     unsigned int flags)
+{
+    testConnPtr privconn = conn->privateData;
+    int ret;
+
+    virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1);
+
+    testDriverLock(privconn);
+    ret = virDomainObjListExport(privconn->domains, conn, domains,
+                                 NULL, flags);
+    testDriverUnlock(privconn);
+
+    return ret;
+}
+
+static char *
+testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED,
+                     virStreamPtr st,
+                     unsigned int screen ATTRIBUTE_UNUSED,
+                     unsigned int flags)
+{
+    char *ret = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (VIR_STRDUP(ret, "image/png") < 0)
+        return NULL;
+
+    if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY) < 0)
+        VIR_FREE(ret);
+
+    return ret;
+}
+
+static int
+testDomainManagedSave(virDomainPtr dom, unsigned int flags)
+{
+    testConnPtr privconn = dom->conn->privateData;
+    virDomainObjPtr vm = NULL;
+    virObjectEventPtr event = NULL;
+    int ret = -1;
+
+    virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE |
+                  VIR_DOMAIN_SAVE_RUNNING |
+                  VIR_DOMAIN_SAVE_PAUSED, -1);
+
+    if (!(vm = testDomObjFromDomain(dom)))
+        return -1;
+
+    if (!virDomainObjIsActive(vm)) {
+        virReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("domain is not running"));
+        goto cleanup;
+    }
+
+    if (!vm->persistent) {
+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+                       _("cannot do managed save for transient domain"));
+        goto cleanup;
+    }
+
+    testDomainShutdownState(dom, vm, VIR_DOMAIN_SHUTOFF_SAVED);
+    event = virDomainEventLifecycleNewFromObj(vm,
+                                     VIR_DOMAIN_EVENT_STOPPED,
+                                     VIR_DOMAIN_EVENT_STOPPED_SAVED);
+    vm->hasManagedSave = true;
+
+    ret = 0;
+ cleanup:
+    virDomainObjEndAPI(&vm);
+    testObjectEventQueueUnlocked(privconn, event);
+
+    return ret;
+}
+
+static int
+testDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
+{
+    virDomainObjPtr vm;
+    int ret;
+
+    virCheckFlags(0, -1);
+
+    if (!(vm = testDomObjFromDomain(dom)))
+        return -1;
+
+    ret = vm->hasManagedSave;
+
+    virDomainObjEndAPI(&vm);
+    return ret;
+}
+
+static int
+testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
+{
+    virDomainObjPtr vm;
+
+    virCheckFlags(0, -1);
+
+    if (!(vm = testDomObjFromDomain(dom)))
+        return -1;
+
+    vm->hasManagedSave = false;
+
+    virDomainObjEndAPI(&vm);
+    return 0;
+}
+
+/*
+ * Network APIs
+ */

 static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn,
                                              const unsigned char *uuid)
@@ -5836,23 +5949,6 @@ testConnectNetworkEventDeregisterAny(virConnectPtr conn,
     return ret;
 }

-static int testConnectListAllDomains(virConnectPtr conn,
-                                     virDomainPtr **domains,
-                                     unsigned int flags)
-{
-    testConnPtr privconn = conn->privateData;
-    int ret;
-
-    virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1);
-
-    testDriverLock(privconn);
-    ret = virDomainObjListExport(privconn->domains, conn, domains,
-                                 NULL, flags);
-    testDriverUnlock(privconn);
-
-    return ret;
-}
-
 static int
 testNodeGetCPUMap(virConnectPtr conn,
                   unsigned char **cpumap,
@@ -5881,25 +5977,6 @@ testNodeGetCPUMap(virConnectPtr conn,
     return ret;
 }

-static char *
-testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED,
-                     virStreamPtr st,
-                     unsigned int screen ATTRIBUTE_UNUSED,
-                     unsigned int flags)
-{
-    char *ret = NULL;
-
-    virCheckFlags(0, NULL);
-
-    if (VIR_STRDUP(ret, "image/png") < 0)
-        return NULL;
-
-    if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY) < 0)
-        VIR_FREE(ret);
-
-    return ret;
-}
-
 static int
 testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED,
                             const char *arch,
@@ -5910,82 +5987,6 @@ testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED,
     return cpuGetModels(arch, models);
 }

-static int
-testDomainManagedSave(virDomainPtr dom, unsigned int flags)
-{
-    testConnPtr privconn = dom->conn->privateData;
-    virDomainObjPtr vm = NULL;
-    virObjectEventPtr event = NULL;
-    int ret = -1;
-
-    virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE |
-                  VIR_DOMAIN_SAVE_RUNNING |
-                  VIR_DOMAIN_SAVE_PAUSED, -1);
-
-    if (!(vm = testDomObjFromDomain(dom)))
-        return -1;
-
-    if (!virDomainObjIsActive(vm)) {
-        virReportError(VIR_ERR_OPERATION_INVALID,
-                       "%s", _("domain is not running"));
-        goto cleanup;
-    }
-
-    if (!vm->persistent) {
-        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                       _("cannot do managed save for transient domain"));
-        goto cleanup;
-    }
-
-    testDomainShutdownState(dom, vm, VIR_DOMAIN_SHUTOFF_SAVED);
-    event = virDomainEventLifecycleNewFromObj(vm,
-                                     VIR_DOMAIN_EVENT_STOPPED,
-                                     VIR_DOMAIN_EVENT_STOPPED_SAVED);
-    vm->hasManagedSave = true;
-
-    ret = 0;
- cleanup:
-    virDomainObjEndAPI(&vm);
-    testObjectEventQueueUnlocked(privconn, event);
-
-    return ret;
-}
-
-
-static int
-testDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
-{
-    virDomainObjPtr vm;
-    int ret;
-
-    virCheckFlags(0, -1);
-
-    if (!(vm = testDomObjFromDomain(dom)))
-        return -1;
-
-    ret = vm->hasManagedSave;
-
-    virDomainObjEndAPI(&vm);
-    return ret;
-}
-
-static int
-testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
-{
-    virDomainObjPtr vm;
-
-    virCheckFlags(0, -1);
-
-    if (!(vm = testDomObjFromDomain(dom)))
-        return -1;
-
-    vm->hasManagedSave = false;
-
-    virDomainObjEndAPI(&vm);
-    return 0;
-}
-
-
 /*
  * Snapshot APIs
  */
-- 
2.4.1