[libvirt] [PATCH 09/15] qemuDriver: 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/qemu/qemu_driver.c | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0128356..4aa8e1f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1663,7 +1663,10 @@ cleanup:
}
-static int qemuDomainSuspend(virDomainPtr dom) {
+static int
+qemuDomainSuspendFlags(virDomainPtr dom,
+ unsigned int flags)
+{
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
int ret = -1;
@@ -1674,10 +1677,12 @@ static int qemuDomainSuspend(virDomainPtr dom) {
int state;
virQEMUDriverConfigPtr cfg = NULL;
+ virCheckFlags(0, -1);
+
if (!(vm = qemuDomObjFromDomain(dom)))
return -1;
- if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0)
+ if (virDomainSuspendFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
if (!virDomainObjIsActive(vm)) {
@@ -1744,7 +1749,17 @@ cleanup:
}
-static int qemuDomainResume(virDomainPtr dom) {
+static int
+qemuDomainSuspend(virDomainPtr dom)
+{
+ return qemuDomainSuspendFlags(dom, 0);
+}
+
+
+static int
+qemuDomainResumeFlags(virDomainPtr dom,
+ unsigned int flags)
+{
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
int ret = -1;
@@ -1753,12 +1768,14 @@ static int qemuDomainResume(virDomainPtr dom) {
virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
+ virCheckFlags(0, -1);
+
if (!(vm = qemuDomObjFromDomain(dom)))
return -1;
cfg = virQEMUDriverGetConfig(driver);
- if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0)
+ if (virDomainResumeFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
@@ -1808,6 +1825,14 @@ cleanup:
return ret;
}
+
+static int
+qemuDomainResume(virDomainPtr dom)
+{
+ return qemuDomainResumeFlags(dom, 0);
+}
+
+
static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) {
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
@@ -16487,7 +16512,9 @@ static virDriver qemuDriver = {
.domainLookupByUUID = qemuDomainLookupByUUID, /* 0.2.0 */
.domainLookupByName = qemuDomainLookupByName, /* 0.2.0 */
.domainSuspend = qemuDomainSuspend, /* 0.2.0 */
+ .domainSuspendFlags = qemuDomainSuspendFlags, /* 1.2.2 */
.domainResume = qemuDomainResume, /* 0.2.0 */
+ .domainResumeFlags = qemuDomainResumeFlags, /* 1.2.2 */
.domainShutdown = qemuDomainShutdown, /* 0.2.0 */
.domainShutdownFlags = qemuDomainShutdownFlags, /* 0.9.10 */
.domainReboot = qemuDomainReboot, /* 0.9.3 */
--
1.8.5.2