Remote driver implementation for the virDomainAbortJob APi

This defines the wire protocol for the new API

* src/remote/remote_protocol.x: Wire protocol definition
* src/remote/remote_driver.c,daemon/remote.c: Client and server
  side implementation
* daemon/remote_dispatch_args.h, daemon/remote_dispatch_prototypes.h,
  daemon/remote_dispatch_table.h, src/remote/remote_protocol.c,
  src/remote/remote_protocol.h: Re-generate from remote_protocol.x

diff --git a/daemon/remote.c b/daemon/remote.c
index 67d663ed04c21f66b3b933d8425c23b53f690a9b..d4713b25d8a058531426bcecff9bca3969ca7102 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -5434,6 +5434,35 @@ remoteDispatchDomainGetJobInfo (struct qemud_server *server ATTRIBUTE_UNUSED,
 }
 
 
+static int
+remoteDispatchDomainAbortJob (struct qemud_server *server ATTRIBUTE_UNUSED,
+                              struct qemud_client *client ATTRIBUTE_UNUSED,
+                              virConnectPtr conn,
+                              remote_message_header *hdr ATTRIBUTE_UNUSED,
+                              remote_error *rerr,
+                              remote_domain_abort_job_args *args,
+                              void *ret ATTRIBUTE_UNUSED)
+{
+    virDomainPtr dom;
+
+    dom = get_nonnull_domain (conn, args->dom);
+    if (dom == NULL) {
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+
+    if (virDomainAbortJob (dom) == -1) {
+        virDomainFree(dom);
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+
+    virDomainFree(dom);
+
+    return 0;
+}
+
+
 /*----- Helpers. -----*/
 
 /* get_nonnull_domain and get_nonnull_network turn an on-wire

diff --git a/daemon/remote_dispatch_args.h b/daemon/remote_dispatch_args.h
index 3a405423a8949bbb9d1d3c5c95dfaae4a00e9209..f97155b6af1fb873825d788b74baccef328c14aa 100644 (file)
--- a/daemon/remote_dispatch_args.h
+++ b/daemon/remote_dispatch_args.h
@@ -139,3 +139,4 @@
     remote_domain_detach_device_flags_args val_remote_domain_detach_device_flags_args;
     remote_cpu_baseline_args val_remote_cpu_baseline_args;
     remote_domain_get_job_info_args val_remote_domain_get_job_info_args;
+    remote_domain_abort_job_args val_remote_domain_abort_job_args;

diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
index 4b8992e72faffca1e2e56015774718cd8f829ec9..b81c8c3a713ae1cd7af3ac2d6b83a2d39a67edb2 100644 (file)
--- a/daemon/remote_dispatch_prototypes.h
+++ b/daemon/remote_dispatch_prototypes.h
@@ -66,6 +66,14 @@ static int remoteDispatchCpuCompare(
     remote_error *err,
     remote_cpu_compare_args *args,
     remote_cpu_compare_ret *ret);
+static int remoteDispatchDomainAbortJob(
+    struct qemud_server *server,
+    struct qemud_client *client,
+    virConnectPtr conn,
+    remote_message_header *hdr,
+    remote_error *err,
+    remote_domain_abort_job_args *args,
+    void *ret);
 static int remoteDispatchDomainAttachDevice(
     struct qemud_server *server,
     struct qemud_client *client,

diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
index a1b34d4a4802f0c679d58ad1832d135fc59b8cdb..5ad6bff8d575b691f8c0839a8c5b3fe2c3d8221a 100644 (file)
--- a/daemon/remote_dispatch_table.h
+++ b/daemon/remote_dispatch_table.h
@@ -822,3 +822,8 @@
     .args_filter = (xdrproc_t) xdr_remote_domain_get_job_info_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_get_job_info_ret,
 },
+{   /* DomainAbortJob => 164 */
+    .fn = (dispatch_fn) remoteDispatchDomainAbortJob,
+    .args_filter = (xdrproc_t) xdr_remote_domain_abort_job_args,
+    .ret_filter = (xdrproc_t) xdr_void,
+},

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 74274bd6bb1aeda5f5d17ea0cf8132380fa88bf0..b7b2e09fcb321faedb42e2cb8ba956b93d4ade48 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7683,6 +7683,30 @@ done:
 }
 
 
+static int
+remoteDomainAbortJob (virDomainPtr domain)
+{
+    int rv = -1;
+    remote_domain_abort_job_args args;
+    struct private_data *priv = domain->conn->privateData;
+
+    remoteDriverLock(priv);
+
+    make_nonnull_domain (&args.dom, domain);
+
+    if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_ABORT_JOB,
+              (xdrproc_t) xdr_remote_domain_abort_job_args, (char *) &args,
+              (xdrproc_t) xdr_void, (char *) NULL) == -1)
+        goto done;
+
+    rv = 0;
+
+done:
+    remoteDriverUnlock(priv);
+    return rv;
+}
+
+
 /*----------------------------------------------------------------------*/
 
 
@@ -9101,7 +9125,7 @@ static virDriver remote_driver = {
     remoteCPUCompare, /* cpuCompare */
     remoteCPUBaseline, /* cpuBaseline */
     remoteDomainGetJobInfo, /* domainGetJobInfo */
-    NULL, /* domainFinishJob */
+    remoteDomainAbortJob, /* domainFinishJob */
 };
 
 static virNetworkDriver network_driver = {

diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c
index a1f33cc14bd5e3b001c5592bc577991ea1252665..701acab65066d692b882455f7ab7cf86e5647487 100644 (file)
--- a/src/remote/remote_protocol.c
+++ b/src/remote/remote_protocol.c
@@ -2999,6 +2999,15 @@ xdr_remote_domain_get_job_info_ret (XDR *xdrs, remote_domain_get_job_info_ret *o
         return TRUE;
 }
 
+bool_t
+xdr_remote_domain_abort_job_args (XDR *xdrs, remote_domain_abort_job_args *objp)
+{
+
+         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
+                 return FALSE;
+        return TRUE;
+}
+
 bool_t
 xdr_remote_procedure (XDR *xdrs, remote_procedure *objp)
 {

diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h
index be2df9347af74fd2d07864c919e4f7677a34fc77..e06d73fa09a2bdc970e5bcc2208653c5d6d0148e 100644 (file)
--- a/src/remote/remote_protocol.h
+++ b/src/remote/remote_protocol.h
@@ -1699,6 +1699,11 @@ struct remote_domain_get_job_info_ret {
         uint64_t fileRemaining;
 };
 typedef struct remote_domain_get_job_info_ret remote_domain_get_job_info_ret;
+
+struct remote_domain_abort_job_args {
+        remote_nonnull_domain dom;
+};
+typedef struct remote_domain_abort_job_args remote_domain_abort_job_args;
 #define REMOTE_PROGRAM 0x20008086
 #define REMOTE_PROTOCOL_VERSION 1
 
@@ -1866,6 +1871,7 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS = 161,
         REMOTE_PROC_CPU_BASELINE = 162,
         REMOTE_PROC_DOMAIN_GET_JOB_INFO = 163,
+        REMOTE_PROC_DOMAIN_ABORT_JOB = 164,
 };
 typedef enum remote_procedure remote_procedure;
 
@@ -2174,6 +2180,7 @@ extern  bool_t xdr_remote_cpu_baseline_args (XDR *, remote_cpu_baseline_args*);
 extern  bool_t xdr_remote_cpu_baseline_ret (XDR *, remote_cpu_baseline_ret*);
 extern  bool_t xdr_remote_domain_get_job_info_args (XDR *, remote_domain_get_job_info_args*);
 extern  bool_t xdr_remote_domain_get_job_info_ret (XDR *, remote_domain_get_job_info_ret*);
+extern  bool_t xdr_remote_domain_abort_job_args (XDR *, remote_domain_abort_job_args*);
 extern  bool_t xdr_remote_procedure (XDR *, remote_procedure*);
 extern  bool_t xdr_remote_message_type (XDR *, remote_message_type*);
 extern  bool_t xdr_remote_message_status (XDR *, remote_message_status*);
@@ -2456,6 +2463,7 @@ extern bool_t xdr_remote_cpu_baseline_args ();
 extern bool_t xdr_remote_cpu_baseline_ret ();
 extern bool_t xdr_remote_domain_get_job_info_args ();
 extern bool_t xdr_remote_domain_get_job_info_ret ();
+extern bool_t xdr_remote_domain_abort_job_args ();
 extern bool_t xdr_remote_procedure ();
 extern bool_t xdr_remote_message_type ();
 extern bool_t xdr_remote_message_status ();

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index e54c739f76f49cf762922249d9e97cf362b15de8..5e33da5852c573f891cf0f57b61df2a3439ce5b0 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1512,6 +1512,11 @@ struct remote_domain_get_job_info_ret {
 };
 
 
+struct remote_domain_abort_job_args {
+    remote_nonnull_domain dom;
+};
+
+
 /*----- Protocol. -----*/
 
 /* Define the program number, protocol version and procedure numbers here. */
@@ -1697,7 +1702,8 @@ enum remote_procedure {
 
     REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS = 161,
     REMOTE_PROC_CPU_BASELINE = 162,
-    REMOTE_PROC_DOMAIN_GET_JOB_INFO = 163
+    REMOTE_PROC_DOMAIN_GET_JOB_INFO = 163,
+    REMOTE_PROC_DOMAIN_ABORT_JOB = 164
 
     /*
      * Notice how the entries are grouped in sets of 10 ?