remote generator, client: Handle functions that return an optional string

diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index c53ebc875875951c9e05f6c087b63089c1dc7571..dd5d482f6c5e196df37742fa853f5e3dc8dcdc76 100755 (executable)
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -953,6 +953,11 @@ elsif ($opt_k) {
                     push(@ret_list, "rv = ret.$1;");
                     $single_ret_var = "char *rv = NULL";
                     $single_ret_type = "char *";
+                } elsif ($ret_member =~ m/^remote_string (\S+);/) {
+                    push(@ret_list, "rv = ret.$1 ? *ret.$1 : NULL;");
+                    push(@ret_list, "VIR_FREE(ret.$1);");
+                    $single_ret_var = "char *rv = NULL";
+                    $single_ret_type = "char *";
                 } elsif ($ret_member =~ m/^remote_nonnull_(domain|network|storage_pool|storage_vol|node_device|interface|secret|nwfilter|domain_snapshot) (\S+);/) {
                     my $name = $1;
                     my $arg_name = $2;

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 45d0f80898ebc617a8fd55868d858784e5c5d76e..409f36ed58b3435b67ff847bed6491af08ed2d6b 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3001,32 +3001,6 @@ remoteDevMonClose(virConnectPtr conn)
     return remoteGenericClose(conn, &conn->devMonPrivateData);
 }
 
-static char *remoteNodeDeviceGetParent(virNodeDevicePtr dev)
-{
-    char *rv = NULL;
-    remote_node_device_get_parent_args args;
-    remote_node_device_get_parent_ret ret;
-    struct private_data *priv = dev->conn->devMonPrivateData;
-
-    remoteDriverLock(priv);
-
-    args.name = dev->name;
-
-    memset (&ret, 0, sizeof ret);
-    if (call (dev->conn, priv, 0, REMOTE_PROC_NODE_DEVICE_GET_PARENT,
-              (xdrproc_t) xdr_remote_node_device_get_parent_args, (char *) &args,
-              (xdrproc_t) xdr_remote_node_device_get_parent_ret, (char *) &ret) == -1)
-        goto done;
-
-    /* Caller frees. */
-    rv = ret.parent ? *ret.parent : NULL;
-    VIR_FREE(ret.parent);
-
-done:
-    remoteDriverUnlock(priv);
-    return rv;
-}
-
 static int
 remoteNodeDeviceDettach (virNodeDevicePtr dev)
 {

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index e204eb0ffe3a9f4bf7ee385dd69e0e70c30cdbe5..63fc778fcbc005dae7601c43d85daf6dde30d646 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -2171,7 +2171,7 @@ enum remote_procedure {
     REMOTE_PROC_NODE_LIST_DEVICES = 112, /* autogen autogen */
     REMOTE_PROC_NODE_DEVICE_LOOKUP_BY_NAME = 113, /* autogen autogen */
     REMOTE_PROC_NODE_DEVICE_GET_XML_DESC = 114, /* autogen autogen */
-    REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115, /* skipgen skipgen */
+    REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115, /* skipgen autogen */
     REMOTE_PROC_NODE_DEVICE_NUM_OF_CAPS = 116, /* autogen autogen */
     REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117, /* autogen autogen */
     REMOTE_PROC_NODE_DEVICE_DETTACH = 118, /* autogen skipgen */