[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 06/15] lxcDriver: Adapt to virDomain{Resume, Suspend}Flags



So far, there are no flags to implement, so just call the
corresponding function with 0 passed as @flags.

Signed-off-by: Michal Privoznik <mprivozn redhat com>
---
 src/lxc/lxc_driver.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 138c706..656fd13 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3055,7 +3055,9 @@ cleanup:
     return ret;
 }
 
-static int lxcDomainSuspend(virDomainPtr dom)
+static int
+lxcDomainSuspendFlags(virDomainPtr dom,
+                      unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
@@ -3063,10 +3065,12 @@ static int lxcDomainSuspend(virDomainPtr dom)
     int ret = -1;
     virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
 
+    virCheckFlags(0, -1);
+
     if (!(vm = lxcDomObjFromDomain(dom)))
         goto cleanup;
 
-    if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0)
+    if (virDomainSuspendFlagsEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
 
     if (!virDomainObjIsActive(vm)) {
@@ -3101,7 +3105,15 @@ cleanup:
     return ret;
 }
 
-static int lxcDomainResume(virDomainPtr dom)
+static int
+lxcDomainSuspend(virDomainPtr dom)
+{
+    return lxcDomainSuspendFlags(dom, 0);
+}
+
+static int
+lxcDomainResumeFlags(virDomainPtr dom,
+                     unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
@@ -3110,12 +3122,14 @@ static int lxcDomainResume(virDomainPtr dom)
     virLXCDomainObjPrivatePtr priv;
     virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
 
+    virCheckFlags(0, -1);
+
     if (!(vm = lxcDomObjFromDomain(dom)))
         goto cleanup;
 
     priv = vm->privateData;
 
-    if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0)
+    if (virDomainResumeFlagsEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
 
     if (!virDomainObjIsActive(vm)) {
@@ -3152,6 +3166,12 @@ cleanup:
 }
 
 static int
+lxcDomainResume(virDomainPtr dom)
+{
+    return lxcDomainResumeFlags(dom, 0);
+}
+
+static int
 lxcDomainOpenConsole(virDomainPtr dom,
                       const char *dev_name,
                       virStreamPtr st,
@@ -5360,7 +5380,9 @@ static virDriver lxcDriver = {
     .domainLookupByUUID = lxcDomainLookupByUUID, /* 0.4.2 */
     .domainLookupByName = lxcDomainLookupByName, /* 0.4.2 */
     .domainSuspend = lxcDomainSuspend, /* 0.7.2 */
+    .domainSuspendFlags = lxcDomainSuspendFlags, /* 1.2.2 */
     .domainResume = lxcDomainResume, /* 0.7.2 */
+    .domainResumeFlags = lxcDomainResumeFlags, /* 1.2.2 */
     .domainDestroy = lxcDomainDestroy, /* 0.4.4 */
     .domainDestroyFlags = lxcDomainDestroyFlags, /* 0.9.4 */
     .domainGetOSType = lxcDomainGetOSType, /* 0.4.2 */
-- 
1.8.5.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]