Add virDomainAbortJobFlags public API

The original virDomainAbortJob did not support flags.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index e7020f19cc7f1da71ce3412331a4fb741b8fd097..0b321f364a4fa5cb6e45d4c9b45b60155ba16f8c 100644 (file)
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -4099,6 +4099,9 @@ int virDomainGetJobStats(virDomainPtr domain,
                          unsigned int flags);
 int virDomainAbortJob(virDomainPtr dom);
 
+int virDomainAbortJobFlags(virDomainPtr dom,
+                           unsigned int flags);
+
 /**
  * virDomainJobOperation:
  *

diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index 69516e8fea41cf5667abe113a520fc2cd56fe0e2..016d5cec7cfb0deeb02cd50c8e010376353045a9 100644 (file)
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -746,6 +746,10 @@ typedef int
 typedef int
 (*virDrvDomainAbortJob)(virDomainPtr domain);
 
+typedef int
+(*virDrvDomainAbortJobFlags)(virDomainPtr domain,
+                             unsigned int flags);
+
 typedef int
 (*virDrvDomainMigrateGetMaxDowntime)(virDomainPtr domain,
                                      unsigned long long *downtime,
@@ -1590,6 +1594,7 @@ struct _virHypervisorDriver {
     virDrvDomainGetJobInfo domainGetJobInfo;
     virDrvDomainGetJobStats domainGetJobStats;
     virDrvDomainAbortJob domainAbortJob;
+    virDrvDomainAbortJobFlags domainAbortJobFlags;
     virDrvDomainMigrateGetMaxDowntime domainMigrateGetMaxDowntime;
     virDrvDomainMigrateSetMaxDowntime domainMigrateSetMaxDowntime;
     virDrvDomainMigrateGetCompressionCache domainMigrateGetCompressionCache;

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 45ada5feeb3bc1f460b9c2bb06040f02c70d5b17..0da4f44fa162070ef6514937db2931b519baa2f7 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -9470,6 +9470,51 @@ virDomainAbortJob(virDomainPtr domain)
 }
 
 
+/**
+ * virDomainAbortJobFlags:
+ * @domain: a domain object
+ * @flags: extra flags; not used yet, callers should always pass 0
+ *
+ * Requests that the current background job be aborted at the
+ * soonest opportunity. In case the job is a migration in a post-copy mode,
+ * this function will report an error (see virDomainMigrateStartPostCopy for
+ * more details).
+ *
+ * Returns 0 in case of success and -1 in case of failure.
+ *
+ * Since: 8.5.0
+ */
+int
+virDomainAbortJobFlags(virDomainPtr domain,
+                       unsigned int flags)
+{
+    virConnectPtr conn;
+
+    VIR_DOMAIN_DEBUG(domain);
+
+    virResetLastError();
+
+    virCheckDomainReturn(domain, -1);
+    conn = domain->conn;
+
+    virCheckReadOnlyGoto(conn->flags, error);
+
+    if (conn->driver->domainAbortJobFlags) {
+        int ret;
+        ret = conn->driver->domainAbortJobFlags(domain, flags);
+        if (ret < 0)
+            goto error;
+        return ret;
+    }
+
+    virReportUnsupportedError();
+
+ error:
+    virDispatchError(conn);
+    return -1;
+}
+
+
 /**
  * virDomainMigrateSetMaxDowntime:
  * @domain: a domain object

diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 9f58b529246ac896fb63b373cd964a01c04c64f6..297a2c436a806e76320c08364e5e47be4ad26f7e 100644 (file)
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -922,4 +922,9 @@ LIBVIRT_8.4.0 {
         virDomainRestoreParams;
 } LIBVIRT_8.0.0;
 
+LIBVIRT_8.5.0 {
+    global:
+        virDomainAbortJobFlags;
+} LIBVIRT_8.4.0;
+
 # .... define new API here using predicted next version number ....

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 423f5f9fb935a7f7c4f43351d573b3be9938771f..3c892bf8e6c840019fbd2e06c9fb92f19b556b7c 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -8534,6 +8534,7 @@ static virHypervisorDriver hypervisor_driver = {
     .domainGetJobInfo = remoteDomainGetJobInfo, /* 0.7.7 */
     .domainGetJobStats = remoteDomainGetJobStats, /* 1.0.3 */
     .domainAbortJob = remoteDomainAbortJob, /* 0.7.7 */
+    .domainAbortJobFlags = remoteDomainAbortJobFlags, /* 8.5.0 */
     .domainMigrateGetMaxDowntime = remoteDomainMigrateGetMaxDowntime, /* 3.7.0 */
     .domainMigrateSetMaxDowntime = remoteDomainMigrateSetMaxDowntime, /* 0.8.0 */
     .domainMigrateGetCompressionCache = remoteDomainMigrateGetCompressionCache, /* 1.0.3 */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 085631c11bd871040a27efe4ae84c21dd9981776..79ffc63f03332b30ab9b85ed0df411a918068a72 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -2492,6 +2492,12 @@ struct remote_domain_abort_job_args {
 };
 
 
+struct remote_domain_abort_job_flags_args {
+    remote_nonnull_domain dom;
+    unsigned int flags;
+};
+
+
 struct remote_domain_migrate_get_max_downtime_args {
     remote_nonnull_domain dom;
     unsigned int flags;
@@ -6947,5 +6953,11 @@ enum remote_procedure {
      * @acl: domain:start
      * @acl: domain:write
      */
-    REMOTE_PROC_DOMAIN_RESTORE_PARAMS = 441
+    REMOTE_PROC_DOMAIN_RESTORE_PARAMS = 441,
+
+    /**
+     * @generate: both
+     * @acl: domain:write
+     */
+    REMOTE_PROC_DOMAIN_ABORT_JOB_FLAGS = 442
 };

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 4ffdce56799f36adef5b41aff20c896598b42249..ca5222439dad89c8f86bf123ebb22d3bbc3990f4 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -1869,6 +1869,10 @@ struct remote_domain_get_job_stats_ret {
 struct remote_domain_abort_job_args {
         remote_nonnull_domain      dom;
 };
+struct remote_domain_abort_job_flags_args {
+        remote_nonnull_domain      dom;
+        u_int                      flags;
+};
 struct remote_domain_migrate_get_max_downtime_args {
         remote_nonnull_domain      dom;
         u_int                      flags;
@@ -3706,4 +3710,5 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_SET_LAUNCH_SECURITY_STATE = 439,
         REMOTE_PROC_DOMAIN_SAVE_PARAMS = 440,
         REMOTE_PROC_DOMAIN_RESTORE_PARAMS = 441,
+        REMOTE_PROC_DOMAIN_ABORT_JOB_FLAGS = 442,
 };