Remote protocol impl for virDomainUpdateDeviceFlags

This defines the wire format for the new virDomainUpdateDeviceFlags()
API, and implements the server & client side of the marshalling code.

* daemon/remote.c: Server side dispatch for virDomainUpdateDeviceFlags
* src/remote/remote_driver.c: Client side serialization for
  virDomainUpdateDeviceFlags
* src/remote/remote_protocol.x: Define wire format for
  virDomainUpdateDeviceFlags
* 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 code

diff --git a/daemon/remote.c b/daemon/remote.c
index 005af422ed2aa8402500e63bf5fbb582628aac7c..af067fb1f2889ffe1ae97715df4138b546964786 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1117,6 +1117,32 @@ remoteDispatchDomainAttachDeviceFlags (struct qemud_server *server ATTRIBUTE_UNU
     return 0;
 }
 
+static int
+remoteDispatchDomainUpdateDeviceFlags (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_update_device_flags_args *args,
+                                       void *ret ATTRIBUTE_UNUSED)
+{
+    virDomainPtr dom;
+
+    dom = get_nonnull_domain (conn, args->dom);
+    if (dom == NULL) {
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+
+    if (virDomainUpdateDeviceFlags (dom, args->xml, args->flags) == -1) {
+        virDomainFree(dom);
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+    virDomainFree(dom);
+    return 0;
+}
+
 static int
 remoteDispatchDomainCreate (struct qemud_server *server ATTRIBUTE_UNUSED,
                             struct qemud_client *client ATTRIBUTE_UNUSED,

diff --git a/daemon/remote_dispatch_args.h b/daemon/remote_dispatch_args.h
index 96b1f2b02616342931cc643060e328a0418694de..beeebd9b891f45acb8bd51daf6d00ef3318ee09f 100644 (file)
--- a/daemon/remote_dispatch_args.h
+++ b/daemon/remote_dispatch_args.h
@@ -144,3 +144,4 @@
     remote_domain_migrate_set_max_downtime_args val_remote_domain_migrate_set_max_downtime_args;
     remote_domain_events_register_any_args val_remote_domain_events_register_any_args;
     remote_domain_events_deregister_any_args val_remote_domain_events_deregister_any_args;
+    remote_domain_update_device_flags_args val_remote_domain_update_device_flags_args;

diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
index c525110e67e53b2afd927405cf91d969b30887da..b95c67a78c1711fcfb8d3683bbce576165b9e563 100644 (file)
--- a/daemon/remote_dispatch_prototypes.h
+++ b/daemon/remote_dispatch_prototypes.h
@@ -506,6 +506,14 @@ static int remoteDispatchDomainUndefine(
     remote_error *err,
     remote_domain_undefine_args *args,
     void *ret);
+static int remoteDispatchDomainUpdateDeviceFlags(
+    struct qemud_server *server,
+    struct qemud_client *client,
+    virConnectPtr conn,
+    remote_message_header *hdr,
+    remote_error *err,
+    remote_domain_update_device_flags_args *args,
+    void *ret);
 static int remoteDispatchDomainXmlFromNative(
     struct qemud_server *server,
     struct qemud_client *client,

diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
index f1b18539097ab4ade9fce0072b6a8704ba5bbd48..20c207dcd98b96df7759a97bb9ac09e106135a20 100644 (file)
--- a/daemon/remote_dispatch_table.h
+++ b/daemon/remote_dispatch_table.h
@@ -867,8 +867,13 @@
     .args_filter = (xdrproc_t) xdr_void,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* Async event DomainEventGraphics => 171 */
+{   /* Async event DomainEventGraphics => 173 */
     .fn = NULL,
     .args_filter = (xdrproc_t) xdr_void,
     .ret_filter = (xdrproc_t) xdr_void,
 },
+{   /* DomainUpdateDeviceFlags => 174 */
+    .fn = (dispatch_fn) remoteDispatchDomainUpdateDeviceFlags,
+    .args_filter = (xdrproc_t) xdr_remote_domain_update_device_flags_args,
+    .ret_filter = (xdrproc_t) xdr_void,
+},

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c01cdadd76af03a365b6040643d52c2c50a47b9f..7d5d11172a66d8b88d409c021cfbab8e03afdba8 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3156,6 +3156,32 @@ done:
     return rv;
 }
 
+static int
+remoteDomainUpdateDeviceFlags (virDomainPtr domain, const char *xml,
+                               unsigned int flags)
+{
+    int rv = -1;
+    remote_domain_update_device_flags_args args;
+    struct private_data *priv = domain->conn->privateData;
+
+    remoteDriverLock(priv);
+
+    make_nonnull_domain (&args.dom, domain);
+    args.xml = (char *) xml;
+    args.flags = flags;
+
+    if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_UPDATE_DEVICE_FLAGS,
+              (xdrproc_t) xdr_remote_domain_update_device_flags_args, (char *) &args,
+              (xdrproc_t) xdr_void, (char *) NULL) == -1)
+        goto done;
+
+    rv = 0;
+
+done:
+    remoteDriverUnlock(priv);
+    return rv;
+}
+
 static int
 remoteDomainGetAutostart (virDomainPtr domain, int *autostart)
 {
@@ -9460,7 +9486,7 @@ static virDriver remote_driver = {
     remoteDomainAttachDeviceFlags, /* domainAttachDeviceFlags */
     remoteDomainDetachDevice, /* domainDetachDevice */
     remoteDomainDetachDeviceFlags, /* domainDetachDeviceFlags */
-    NULL, /* domainUpdateDeviceFlags */
+    remoteDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */
     remoteDomainGetAutostart, /* domainGetAutostart */
     remoteDomainSetAutostart, /* domainSetAutostart */
     remoteDomainGetSchedulerType, /* domainGetSchedulerType */

diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c
index dc5222b61c500b18d588c5f0950206b0a3aa4924..6487110023df48edad3c64cacf9ee64e80f68608 100644 (file)
--- a/src/remote/remote_protocol.c
+++ b/src/remote/remote_protocol.c
@@ -1318,6 +1318,19 @@ xdr_remote_domain_detach_device_flags_args (XDR *xdrs, remote_domain_detach_devi
         return TRUE;
 }
 
+bool_t
+xdr_remote_domain_update_device_flags_args (XDR *xdrs, remote_domain_update_device_flags_args *objp)
+{
+
+         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
+                 return FALSE;
+         if (!xdr_remote_nonnull_string (xdrs, &objp->xml))
+                 return FALSE;
+         if (!xdr_u_int (xdrs, &objp->flags))
+                 return FALSE;
+        return TRUE;
+}
+
 bool_t
 xdr_remote_domain_get_autostart_args (XDR *xdrs, remote_domain_get_autostart_args *objp)
 {

diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h
index fa223ed9ef8493ed1765c5dc1ec053516f7ce8fa..e2e74facab6fa65ee1dd005251ba8348af1c3d19 100644 (file)
--- a/src/remote/remote_protocol.h
+++ b/src/remote/remote_protocol.h
@@ -739,6 +739,13 @@ struct remote_domain_detach_device_flags_args {
 };
 typedef struct remote_domain_detach_device_flags_args remote_domain_detach_device_flags_args;
 
+struct remote_domain_update_device_flags_args {
+        remote_nonnull_domain dom;
+        remote_nonnull_string xml;
+        u_int flags;
+};
+typedef struct remote_domain_update_device_flags_args remote_domain_update_device_flags_args;
+
 struct remote_domain_get_autostart_args {
         remote_nonnull_domain dom;
 };
@@ -1956,6 +1963,7 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_EVENT_WATCHDOG = 171,
         REMOTE_PROC_DOMAIN_EVENT_IO_ERROR = 172,
         REMOTE_PROC_DOMAIN_EVENT_GRAPHICS = 173,
+        REMOTE_PROC_DOMAIN_UPDATE_DEVICE_FLAGS = 174,
 };
 typedef enum remote_procedure remote_procedure;
 
@@ -2097,6 +2105,7 @@ extern  bool_t xdr_remote_domain_attach_device_args (XDR *, remote_domain_attach
 extern  bool_t xdr_remote_domain_attach_device_flags_args (XDR *, remote_domain_attach_device_flags_args*);
 extern  bool_t xdr_remote_domain_detach_device_args (XDR *, remote_domain_detach_device_args*);
 extern  bool_t xdr_remote_domain_detach_device_flags_args (XDR *, remote_domain_detach_device_flags_args*);
+extern  bool_t xdr_remote_domain_update_device_flags_args (XDR *, remote_domain_update_device_flags_args*);
 extern  bool_t xdr_remote_domain_get_autostart_args (XDR *, remote_domain_get_autostart_args*);
 extern  bool_t xdr_remote_domain_get_autostart_ret (XDR *, remote_domain_get_autostart_ret*);
 extern  bool_t xdr_remote_domain_set_autostart_args (XDR *, remote_domain_set_autostart_args*);
@@ -2391,6 +2400,7 @@ extern bool_t xdr_remote_domain_attach_device_args ();
 extern bool_t xdr_remote_domain_attach_device_flags_args ();
 extern bool_t xdr_remote_domain_detach_device_args ();
 extern bool_t xdr_remote_domain_detach_device_flags_args ();
+extern bool_t xdr_remote_domain_update_device_flags_args ();
 extern bool_t xdr_remote_domain_get_autostart_args ();
 extern bool_t xdr_remote_domain_get_autostart_ret ();
 extern bool_t xdr_remote_domain_set_autostart_args ();

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 394783708c8c35c1607fd1a42d5bd724eae02b0b..a205cfb01710a68f23b511bdba70e32df151033a 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -730,6 +730,12 @@ struct remote_domain_detach_device_flags_args {
     unsigned int flags;
 };
 
+struct remote_domain_update_device_flags_args {
+    remote_nonnull_domain dom;
+    remote_nonnull_string xml;
+    unsigned int flags;
+};
+
 struct remote_domain_get_autostart_args {
     remote_nonnull_domain dom;
 };
@@ -1775,7 +1781,8 @@ enum remote_procedure {
 
     REMOTE_PROC_DOMAIN_EVENT_WATCHDOG = 171,
     REMOTE_PROC_DOMAIN_EVENT_IO_ERROR = 172,
-    REMOTE_PROC_DOMAIN_EVENT_GRAPHICS = 173
+    REMOTE_PROC_DOMAIN_EVENT_GRAPHICS = 173,
+    REMOTE_PROC_DOMAIN_UPDATE_DEVICE_FLAGS = 174
 
     /*
      * Notice how the entries are grouped in sets of 10 ?