[libvirt] [PATCH 05/15] libxlDriver: 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(a)redhat.com>
---
src/libxl/libxl_driver.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index cb3deec..f101498 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1294,7 +1294,8 @@ libxlDomainLookupByName(virConnectPtr conn, const char *name)
}
static int
-libxlDomainSuspend(virDomainPtr dom)
+libxlDomainSuspendFlags(virDomainPtr dom,
+ unsigned int flags)
{
libxlDriverPrivatePtr driver = dom->conn->privateData;
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
@@ -1303,10 +1304,12 @@ libxlDomainSuspend(virDomainPtr dom)
virObjectEventPtr event = NULL;
int ret = -1;
+ virCheckFlags(0, -1);
+
if (!(vm = libxlDomObjFromDomain(dom)))
goto cleanup;
- if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0)
+ if (virDomainSuspendFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
if (!virDomainObjIsActive(vm)) {
@@ -1346,7 +1349,14 @@ cleanup:
static int
-libxlDomainResume(virDomainPtr dom)
+libxlDomainSuspend(virDomainPtr dom)
+{
+ return libxlDomainSuspendFlags(dom, 0);
+}
+
+static int
+libxlDomainResumeFlags(virDomainPtr dom,
+ unsigned int flags)
{
libxlDriverPrivatePtr driver = dom->conn->privateData;
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
@@ -1355,10 +1365,12 @@ libxlDomainResume(virDomainPtr dom)
virObjectEventPtr event = NULL;
int ret = -1;
+ virCheckFlags(0, -1);
+
if (!(vm = libxlDomObjFromDomain(dom)))
goto cleanup;
- if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0)
+ if (virDomainResumeFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
if (!virDomainObjIsActive(vm)) {
@@ -1398,6 +1410,12 @@ cleanup:
}
static int
+libxlDomainResume(virDomainPtr dom)
+{
+ return libxlDomainResumeFlags(dom, 0);
+}
+
+static int
libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
{
virDomainObjPtr vm;
@@ -4344,7 +4362,9 @@ static virDriver libxlDriver = {
.domainLookupByUUID = libxlDomainLookupByUUID, /* 0.9.0 */
.domainLookupByName = libxlDomainLookupByName, /* 0.9.0 */
.domainSuspend = libxlDomainSuspend, /* 0.9.0 */
+ .domainSuspendFlags = libxlDomainSuspendFlags, /* 1.2.2 */
.domainResume = libxlDomainResume, /* 0.9.0 */
+ .domainResumeFlags = libxlDomainResumeFlags, /* 1.2.2 */
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */
--
1.8.5.2