rpc: gendispatch: trim Flags from the return struct name

This lets it generate the remote dispatch for StorageVolGetInfoFlags.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index b08bd5b8ba9cb44d26ad5f8196ef83da7b9195ae..2741a32f63461bb1150bb9a87da9284b4ba5fa9b 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -7162,41 +7162,6 @@ remoteDispatchDomainInterfaceAddresses(virNetServerPtr server G_GNUC_UNUSED,
 }
 
 
-static int
-remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server G_GNUC_UNUSED,
-                                     virNetServerClientPtr client,
-                                     virNetMessagePtr msg G_GNUC_UNUSED,
-                                     virNetMessageErrorPtr rerr,
-                                     remote_storage_vol_get_info_flags_args *args,
-                                     remote_storage_vol_get_info_flags_ret *ret)
-{
-    int rv = -1;
-    virStorageVolPtr vol = NULL;
-    virStorageVolInfo tmp;
-    virConnectPtr conn = remoteGetStorageConn(client);
-
-    if (!conn)
-        goto cleanup;
-
-    if (!(vol = get_nonnull_storage_vol(conn, args->vol)))
-        goto cleanup;
-
-    if (virStorageVolGetInfoFlags(vol, &tmp, args->flags) < 0)
-        goto cleanup;
-
-    ret->type = tmp.type;
-    ret->capacity = tmp.capacity;
-    ret->allocation = tmp.allocation;
-    rv = 0;
-
- cleanup:
-    if (rv < 0)
-        virNetMessageSaveError(rerr);
-    virObjectUnref(vol);
-    return rv;
-}
-
-
 static int
 remoteDispatchNetworkPortGetParameters(virNetServerPtr server G_GNUC_UNUSED,
                                        virNetServerClientPtr client,

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 1f7963510a9ae3006739b93b6f8b31beb7de694e..d4393680e96ab9223af560dde0a5568a1b60015e 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -6367,7 +6367,7 @@ enum remote_procedure {
     REMOTE_PROC_NODE_DEVICE_EVENT_UPDATE = 377,
 
     /**
-     * @generate: none
+     * @generate: server
      * @priority: high
      * @acl: storage_vol:read
      */

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index 8656c8f205afc09d07f8d47a9ffeea9f89fd940c..987a136566c7f1c36ed3de90886a5917b9197d0e 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -994,6 +994,7 @@ elsif ($mode eq "server") {
                 } else {
                     my $struct_name = $call->{ProcName};
                     $struct_name =~ s/Get//;
+                    $struct_name =~ s/Flags$//;
 
                     splice(@args_list, $call->{ret_offset}, 0, ("&tmp"));