[libvirt PATCH 76/80] qemu: Implement virDomainAbortJobFlags
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_driver.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e268d3a478..efa6cbe14d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12770,7 +12770,9 @@ qemuDomainAbortJobMigration(virDomainObj *vm)
}
-static int qemuDomainAbortJob(virDomainPtr dom)
+static int
+qemuDomainAbortJobFlags(virDomainPtr dom,
+ unsigned int flags)
{
virQEMUDriver *driver = dom->conn->privateData;
virDomainObj *vm;
@@ -12778,10 +12780,12 @@ static int qemuDomainAbortJob(virDomainPtr dom)
qemuDomainObjPrivate *priv;
int reason;
+ virCheckFlags(0, -1);
+
if (!(vm = qemuDomainObjFromDomain(dom)))
goto cleanup;
- if (virDomainAbortJobEnsureACL(dom->conn, vm->def) < 0)
+ if (virDomainAbortJobFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, VIR_JOB_ABORT) < 0)
@@ -12860,6 +12864,13 @@ static int qemuDomainAbortJob(virDomainPtr dom)
}
+static int
+qemuDomainAbortJob(virDomainPtr dom)
+{
+ return qemuDomainAbortJobFlags(dom, 0);
+}
+
+
static int
qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
unsigned long long downtime,
@@ -21018,6 +21029,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
.domainGetJobInfo = qemuDomainGetJobInfo, /* 0.7.7 */
.domainGetJobStats = qemuDomainGetJobStats, /* 1.0.3 */
.domainAbortJob = qemuDomainAbortJob, /* 0.7.7 */
+ .domainAbortJobFlags = qemuDomainAbortJobFlags, /* 8.4.0 */
.domainMigrateGetMaxDowntime = qemuDomainMigrateGetMaxDowntime, /* 3.7.0 */
.domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime, /* 0.8.0 */
.domainMigrateGetCompressionCache = qemuDomainMigrateGetCompressionCache, /* 1.0.3
*/
--
2.35.1