Remote driver plumbing for virStorageVolCreateXMLFrom

diff --git a/ChangeLog b/ChangeLog
index 6338b0ae69c2b0137c374f4741d71a0a2bca37eb..703d805717a4c81f16a6d95d13f7adc482c3f37f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 12 16:11:14 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+       * qemud/remote.c qemud/remote_dispatch_args.h
+         qemud/remote_dispatch_prototypes.h qemud/remote_distpatch_ret.h
+         qemud/remote_dispatch_table.h qemud/remote_protocol.c
+         qemud/remote_protocol.h qemud/remote_protocol.x
+         src/remote_internal.c:
+         Remote support for virStorageVolCreateXMLFrom
+
 Tue May 12 16:00:49 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
        * include/libvirt/libvirt.h include/libvirt/libvirt.c

diff --git a/qemud/remote.c b/qemud/remote.c
index 8d24a3a1992c1d34a18c7a6f337e9a7c6fed9795..a92dea9b382504da07f89dc95302b00f375a5b4b 100644 (file)
--- a/qemud/remote.c
+++ b/qemud/remote.c
@@ -3831,6 +3831,40 @@ remoteDispatchStorageVolCreateXml (struct qemud_server *server ATTRIBUTE_UNUSED,
     return 0;
 }
 
+static int
+remoteDispatchStorageVolCreateXmlFrom (struct qemud_server *server ATTRIBUTE_UNUSED,
+                                       struct qemud_client *client ATTRIBUTE_UNUSED,
+                                       virConnectPtr conn,
+                                       remote_error *rerr,
+                                       remote_storage_vol_create_xml_from_args *args,
+                                       remote_storage_vol_create_xml_from_ret *ret)
+{
+    virStoragePoolPtr pool;
+    virStorageVolPtr clonevol, newvol;
+
+    pool = get_nonnull_storage_pool (conn, args->pool);
+    if (pool == NULL) {
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+
+    clonevol = get_nonnull_storage_vol (conn, args->clonevol);
+    if (clonevol == NULL) {
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+
+    newvol = virStorageVolCreateXMLFrom (pool, args->xml, clonevol,
+                                         args->flags);
+    if (newvol == NULL) {
+        remoteDispatchConnError(rerr, conn);
+        return -1;
+    }
+
+    make_nonnull_storage_vol (&ret->vol, newvol);
+    virStorageVolFree(newvol);
+    return 0;
+}
 
 static int
 remoteDispatchStorageVolDelete (struct qemud_server *server ATTRIBUTE_UNUSED,

diff --git a/qemud/remote_dispatch_args.h b/qemud/remote_dispatch_args.h
index 58eccf557d844a2ef69eb66c63faf11fe6ec32a8..8f8b05b57f465bbd8623fd024f27548bf176089f 100644 (file)
--- a/qemud/remote_dispatch_args.h
+++ b/qemud/remote_dispatch_args.h
@@ -105,3 +105,4 @@
     remote_domain_get_security_label_args val_remote_domain_get_security_label_args;
     remote_node_device_create_xml_args val_remote_node_device_create_xml_args;
     remote_node_device_destroy_args val_remote_node_device_destroy_args;
+    remote_storage_vol_create_xml_from_args val_remote_storage_vol_create_xml_from_args;

diff --git a/qemud/remote_dispatch_prototypes.h b/qemud/remote_dispatch_prototypes.h
index 96dcb2a6b1183a19f9e0e6b85ab72ed7cae6ace9..1a2d98b7cb4eae52537a1e6d86e937474b653883 100644 (file)
--- a/qemud/remote_dispatch_prototypes.h
+++ b/qemud/remote_dispatch_prototypes.h
@@ -814,6 +814,13 @@ static int remoteDispatchStorageVolCreateXml(
     remote_error *err,
     remote_storage_vol_create_xml_args *args,
     remote_storage_vol_create_xml_ret *ret);
+static int remoteDispatchStorageVolCreateXmlFrom(
+    struct qemud_server *server,
+    struct qemud_client *client,
+    virConnectPtr conn,
+    remote_error *err,
+    remote_storage_vol_create_xml_from_args *args,
+    remote_storage_vol_create_xml_from_ret *ret);
 static int remoteDispatchStorageVolDelete(
     struct qemud_server *server,
     struct qemud_client *client,

diff --git a/qemud/remote_dispatch_ret.h b/qemud/remote_dispatch_ret.h
index 3325c8b75ea3f8797e811be46e615fe68d165269..75e2ca64138e151a30f40c7b9def3d7a3c76c0d2 100644 (file)
--- a/qemud/remote_dispatch_ret.h
+++ b/qemud/remote_dispatch_ret.h
@@ -89,3 +89,4 @@
     remote_domain_get_security_label_ret val_remote_domain_get_security_label_ret;
     remote_node_get_security_model_ret val_remote_node_get_security_model_ret;
     remote_node_device_create_xml_ret val_remote_node_device_create_xml_ret;
+    remote_storage_vol_create_xml_from_ret val_remote_storage_vol_create_xml_from_ret;

diff --git a/qemud/remote_dispatch_table.h b/qemud/remote_dispatch_table.h
index ac7f9b996b0e95f83cc6ccb776764f0d5af8c843..e601a6c8128ef2a3b2502d48ced700e6d5b03eb3 100644 (file)
--- a/qemud/remote_dispatch_table.h
+++ b/qemud/remote_dispatch_table.h
@@ -627,3 +627,8 @@
     .args_filter = (xdrproc_t) xdr_remote_node_device_destroy_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
+{   /* StorageVolCreateXmlFrom => 125 */
+    .fn = (dispatch_fn) remoteDispatchStorageVolCreateXmlFrom,
+    .args_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_from_args,
+    .ret_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_from_ret,
+},

diff --git a/qemud/remote_protocol.c b/qemud/remote_protocol.c
index af3c792dccb55168cd2c6c88a83a4fad258ff808..e9b84aa0267fd24979b2d7deb4989bf231fd24bd 100644 (file)
--- a/qemud/remote_protocol.c
+++ b/qemud/remote_protocol.c
@@ -1991,6 +1991,30 @@ xdr_remote_storage_vol_create_xml_ret (XDR *xdrs, remote_storage_vol_create_xml_
         return TRUE;
 }
 
+bool_t
+xdr_remote_storage_vol_create_xml_from_args (XDR *xdrs, remote_storage_vol_create_xml_from_args *objp)
+{
+
+         if (!xdr_remote_nonnull_storage_pool (xdrs, &objp->pool))
+                 return FALSE;
+         if (!xdr_remote_nonnull_string (xdrs, &objp->xml))
+                 return FALSE;
+         if (!xdr_remote_nonnull_storage_vol (xdrs, &objp->clonevol))
+                 return FALSE;
+         if (!xdr_u_int (xdrs, &objp->flags))
+                 return FALSE;
+        return TRUE;
+}
+
+bool_t
+xdr_remote_storage_vol_create_xml_from_ret (XDR *xdrs, remote_storage_vol_create_xml_from_ret *objp)
+{
+
+         if (!xdr_remote_nonnull_storage_vol (xdrs, &objp->vol))
+                 return FALSE;
+        return TRUE;
+}
+
 bool_t
 xdr_remote_storage_vol_delete_args (XDR *xdrs, remote_storage_vol_delete_args *objp)
 {

diff --git a/qemud/remote_protocol.h b/qemud/remote_protocol.h
index 9d67e588459cafb328612aaaa1d2287840bf1927..9ee17a966f3a259863b57757b7bc611f909d6cc8 100644 (file)
--- a/qemud/remote_protocol.h
+++ b/qemud/remote_protocol.h
@@ -1120,6 +1120,19 @@ struct remote_storage_vol_create_xml_ret {
 };
 typedef struct remote_storage_vol_create_xml_ret remote_storage_vol_create_xml_ret;
 
+struct remote_storage_vol_create_xml_from_args {
+        remote_nonnull_storage_pool pool;
+        remote_nonnull_string xml;
+        remote_nonnull_storage_vol clonevol;
+        u_int flags;
+};
+typedef struct remote_storage_vol_create_xml_from_args remote_storage_vol_create_xml_from_args;
+
+struct remote_storage_vol_create_xml_from_ret {
+        remote_nonnull_storage_vol vol;
+};
+typedef struct remote_storage_vol_create_xml_from_ret remote_storage_vol_create_xml_from_ret;
+
 struct remote_storage_vol_delete_args {
         remote_nonnull_storage_vol vol;
         u_int flags;
@@ -1415,6 +1428,7 @@ enum remote_procedure {
         REMOTE_PROC_NODE_GET_SECURITY_MODEL = 122,
         REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123,
         REMOTE_PROC_NODE_DEVICE_DESTROY = 124,
+        REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125,
 };
 typedef enum remote_procedure remote_procedure;
 
@@ -1623,6 +1637,8 @@ extern  bool_t xdr_remote_storage_vol_lookup_by_path_args (XDR *, remote_storage
 extern  bool_t xdr_remote_storage_vol_lookup_by_path_ret (XDR *, remote_storage_vol_lookup_by_path_ret*);
 extern  bool_t xdr_remote_storage_vol_create_xml_args (XDR *, remote_storage_vol_create_xml_args*);
 extern  bool_t xdr_remote_storage_vol_create_xml_ret (XDR *, remote_storage_vol_create_xml_ret*);
+extern  bool_t xdr_remote_storage_vol_create_xml_from_args (XDR *, remote_storage_vol_create_xml_from_args*);
+extern  bool_t xdr_remote_storage_vol_create_xml_from_ret (XDR *, remote_storage_vol_create_xml_from_ret*);
 extern  bool_t xdr_remote_storage_vol_delete_args (XDR *, remote_storage_vol_delete_args*);
 extern  bool_t xdr_remote_storage_vol_dump_xml_args (XDR *, remote_storage_vol_dump_xml_args*);
 extern  bool_t xdr_remote_storage_vol_dump_xml_ret (XDR *, remote_storage_vol_dump_xml_ret*);
@@ -1837,6 +1853,8 @@ extern bool_t xdr_remote_storage_vol_lookup_by_path_args ();
 extern bool_t xdr_remote_storage_vol_lookup_by_path_ret ();
 extern bool_t xdr_remote_storage_vol_create_xml_args ();
 extern bool_t xdr_remote_storage_vol_create_xml_ret ();
+extern bool_t xdr_remote_storage_vol_create_xml_from_args ();
+extern bool_t xdr_remote_storage_vol_create_xml_from_ret ();
 extern bool_t xdr_remote_storage_vol_delete_args ();
 extern bool_t xdr_remote_storage_vol_dump_xml_args ();
 extern bool_t xdr_remote_storage_vol_dump_xml_ret ();

diff --git a/qemud/remote_protocol.x b/qemud/remote_protocol.x
index 2c79949f96643397973284533485ccb5308b7973..1f2735093870858c1f5aac8279b6b3081ebb2928 100644 (file)
--- a/qemud/remote_protocol.x
+++ b/qemud/remote_protocol.x
@@ -1002,6 +1002,17 @@ struct remote_storage_vol_create_xml_ret {
     remote_nonnull_storage_vol vol;
 };
 
+struct remote_storage_vol_create_xml_from_args {
+    remote_nonnull_storage_pool pool;
+    remote_nonnull_string xml;
+    remote_nonnull_storage_vol clonevol;
+    unsigned flags;
+};
+
+struct remote_storage_vol_create_xml_from_ret {
+    remote_nonnull_storage_vol vol;
+};
+
 struct remote_storage_vol_delete_args {
     remote_nonnull_storage_vol vol;
     unsigned flags;
@@ -1286,7 +1297,9 @@ enum remote_procedure {
     REMOTE_PROC_NODE_GET_SECURITY_MODEL = 122,
 
     REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123,
-    REMOTE_PROC_NODE_DEVICE_DESTROY = 124
+    REMOTE_PROC_NODE_DEVICE_DESTROY = 124,
+
+    REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125
 };
 
 /* Custom RPC structure. */

diff --git a/src/remote_internal.c b/src/remote_internal.c
index 64c24f42e2513e2fe0f7abc3e7432ab237c1e1d1..1ca77841c0d3aa6e82de950c103be8afd8bce59d 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -4499,6 +4499,38 @@ done:
     return vol;
 }
 
+static virStorageVolPtr
+remoteStorageVolCreateXMLFrom (virStoragePoolPtr pool,
+                               const char *xmlDesc,
+                               virStorageVolPtr clonevol,
+                               unsigned int flags)
+{
+    virStorageVolPtr newvol = NULL;
+    remote_storage_vol_create_xml_from_args args;
+    remote_storage_vol_create_xml_from_ret ret;
+    struct private_data *priv = pool->conn->storagePrivateData;
+
+    remoteDriverLock(priv);
+
+    make_nonnull_storage_pool (&args.pool, pool);
+    make_nonnull_storage_vol (&args.clonevol, clonevol);
+    args.xml = (char *) xmlDesc;
+    args.flags = flags;
+
+    memset (&ret, 0, sizeof ret);
+    if (call (pool->conn, priv, 0, REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM,
+              (xdrproc_t) xdr_remote_storage_vol_create_xml_from_args, (char *) &args,
+              (xdrproc_t) xdr_remote_storage_vol_create_xml_from_ret, (char *) &ret) == -1)
+        goto done;
+
+    newvol = get_nonnull_storage_vol (pool->conn, ret.vol);
+    xdr_free ((xdrproc_t) &xdr_remote_storage_vol_create_xml_from_ret, (char *) &ret);
+
+done:
+    remoteDriverUnlock(priv);
+    return newvol;
+}
+
 static int
 remoteStorageVolDelete (virStorageVolPtr vol,
                         unsigned int flags)
@@ -7018,6 +7050,7 @@ static virStorageDriver storage_driver = {
     .volLookupByKey = remoteStorageVolLookupByKey,
     .volLookupByPath = remoteStorageVolLookupByPath,
     .volCreateXML = remoteStorageVolCreateXML,
+    .volCreateXMLFrom = remoteStorageVolCreateXMLFrom,
     .volDelete = remoteStorageVolDelete,
     .volGetInfo = remoteStorageVolGetInfo,
     .volGetXMLDesc = remoteStorageVolDumpXML,