[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/6] Make naming of remote procedures match API names exactly



From: "Daniel P. Berrange" <berrange redhat com>

A number of the remote procedure names did not match the
corresponding API names. For example, many lacked the
word 'CONNECT', others re-arranged the names. Update the
procedures so their names exactly match the API names.
Then remove the special case handling of these APIs in
the generator

Signed-off-by: Daniel P. Berrange <berrange redhat com>
---
 daemon/remote.c              |  83 ++++++++---------
 src/qemu_protocol-structs    |   6 +-
 src/remote/qemu_protocol.x   |   6 +-
 src/remote/remote_driver.c   | 216 +++++++++++++++++++++----------------------
 src/remote/remote_protocol.x | 198 +++++++++++++++++++--------------------
 src/remote_protocol-structs  | 198 +++++++++++++++++++--------------------
 src/rpc/gendispatch.pl       |  31 ++-----
 7 files changed, 363 insertions(+), 375 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index c559d6f..cc2ecec 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -719,11 +719,11 @@ void *remoteClientInitHook(virNetServerClientPtr client,
 /*----- Functions. -----*/
 
 static int
-remoteDispatchOpen(virNetServerPtr server,
-                   virNetServerClientPtr client,
-                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                   virNetMessageErrorPtr rerr,
-                   struct remote_open_args *args)
+remoteDispatchConnectOpen(virNetServerPtr server,
+                          virNetServerClientPtr client,
+                          virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                          virNetMessageErrorPtr rerr,
+                          struct remote_connect_open_args *args)
 {
     const char *name;
     unsigned int flags;
@@ -772,10 +772,10 @@ cleanup:
 
 
 static int
-remoteDispatchClose(virNetServerPtr server ATTRIBUTE_UNUSED,
-                    virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                    virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                    virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
+remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED,
+                           virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                           virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                           virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
 {
     virNetServerClientDelayedClose(client);
     return 0;
@@ -3124,11 +3124,11 @@ cleanup:
  * Register / deregister events
  ***************************/
 static int
-remoteDispatchDomainEventsRegister(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                                   virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
-                                   remote_domain_events_register_ret *ret ATTRIBUTE_UNUSED)
+remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                         virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                                         virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                         virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+                                         remote_connect_domain_event_register_ret *ret ATTRIBUTE_UNUSED)
 {
     int callbackID;
     int rv = -1;
@@ -3166,11 +3166,11 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainEventsDeregister(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                     virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                                     virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
-                                     remote_domain_events_deregister_ret *ret ATTRIBUTE_UNUSED)
+remoteDispatchConnectDomainEventDeregister(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                           virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                                           virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                           virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+                                           remote_connect_domain_event_deregister_ret *ret ATTRIBUTE_UNUSED)
 {
     int rv = -1;
     struct daemonClientPrivate *priv =
@@ -3313,11 +3313,11 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainEventsRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                      virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                                      virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                                      virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
-                                      remote_domain_events_register_any_args *args)
+remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                            virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                                            virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                            virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+                                            remote_connect_domain_event_register_any_args *args)
 {
     int callbackID;
     int rv = -1;
@@ -3362,11 +3362,11 @@ cleanup:
 
 
 static int
-remoteDispatchDomainEventsDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                        virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                                        virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                                        virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
-                                        remote_domain_events_deregister_any_args *args)
+remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                              virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                                              virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                              virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+                                              remote_connect_domain_event_deregister_any_args *args)
 {
     int callbackID = -1;
     int rv = -1;
@@ -3407,12 +3407,12 @@ cleanup:
 }
 
 static int
-qemuDispatchMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED,
-                           virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                           virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                           virNetMessageErrorPtr rerr,
-                           qemu_monitor_command_args *args,
-                           qemu_monitor_command_ret *ret)
+qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                 virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                                 virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                 virNetMessageErrorPtr rerr,
+                                 qemu_domain_monitor_command_args *args,
+                                 qemu_domain_monitor_command_ret *ret)
 {
     virDomainPtr dom = NULL;
     int rv = -1;
@@ -3699,13 +3699,12 @@ cleanup:
 }
 
 
-static int remoteDispatchSupportsFeature(
-    virNetServerPtr server ATTRIBUTE_UNUSED,
-    virNetServerClientPtr client,
-    virNetMessagePtr msg ATTRIBUTE_UNUSED,
-    virNetMessageErrorPtr rerr,
-    remote_supports_feature_args *args,
-    remote_supports_feature_ret *ret)
+static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                                virNetServerClientPtr client,
+                                                virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                                virNetMessageErrorPtr rerr,
+                                                remote_connect_supports_feature_args *args,
+                                                remote_connect_supports_feature_ret *ret)
 {
     int rv = -1;
     int supported;
diff --git a/src/qemu_protocol-structs b/src/qemu_protocol-structs
index e6cde60..0dcd2c6 100644
--- a/src/qemu_protocol-structs
+++ b/src/qemu_protocol-structs
@@ -4,12 +4,12 @@ struct remote_nonnull_domain {
         remote_uuid                uuid;
         int                        id;
 };
-struct qemu_monitor_command_args {
+struct qemu_domain_monitor_command_args {
         remote_nonnull_domain      dom;
         remote_nonnull_string      cmd;
         u_int                      flags;
 };
-struct qemu_monitor_command_ret {
+struct qemu_domain_monitor_command_ret {
         remote_nonnull_string      result;
 };
 struct qemu_domain_attach_args {
@@ -29,7 +29,7 @@ struct qemu_domain_agent_command_ret {
         remote_string              result;
 };
 enum qemu_procedure {
-        QEMU_PROC_MONITOR_COMMAND = 1,
+        QEMU_PROC_DOMAIN_MONITOR_COMMAND = 1,
         QEMU_PROC_DOMAIN_ATTACH = 2,
         QEMU_PROC_DOMAIN_AGENT_COMMAND = 3,
 };
diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x
index 2ac8c1b..63fd92f 100644
--- a/src/remote/qemu_protocol.x
+++ b/src/remote/qemu_protocol.x
@@ -27,13 +27,13 @@
 %#include <arpa/inet.h>
 
 /*----- Protocol. -----*/
-struct qemu_monitor_command_args {
+struct qemu_domain_monitor_command_args {
     remote_nonnull_domain dom;
     remote_nonnull_string cmd;
     unsigned int flags;
 };
 
-struct qemu_monitor_command_ret {
+struct qemu_domain_monitor_command_ret {
     remote_nonnull_string result;
 };
 
@@ -92,7 +92,7 @@ enum qemu_procedure {
      * @generate: none
      * @priority: low
      */
-    QEMU_PROC_MONITOR_COMMAND = 1,
+    QEMU_PROC_DOMAIN_MONITOR_COMMAND = 1,
 
     /**
      * @generate: both
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 18c086b..6790f78 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -800,14 +800,14 @@ doRemoteOpen(virConnectPtr conn,
         goto failed;
 
     if (virNetClientKeepAliveIsSupported(priv->client)) {
-        remote_supports_feature_args args =
+        remote_connect_supports_feature_args args =
             { VIR_DRV_FEATURE_PROGRAM_KEEPALIVE };
-        remote_supports_feature_ret ret = { 0 };
+        remote_connect_supports_feature_ret ret = { 0 };
         int rc;
 
-        rc = call(conn, priv, 0, REMOTE_PROC_SUPPORTS_FEATURE,
-                  (xdrproc_t)xdr_remote_supports_feature_args, (char *) &args,
-                  (xdrproc_t)xdr_remote_supports_feature_ret, (char *) &ret);
+        rc = call(conn, priv, 0, REMOTE_PROC_CONNECT_SUPPORTS_FEATURE,
+                  (xdrproc_t)xdr_remote_connect_supports_feature_args, (char *) &args,
+                  (xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *) &ret);
 
         if (rc != -1 && ret.supported) {
             priv->serverKeepAlive = true;
@@ -819,25 +819,25 @@ doRemoteOpen(virConnectPtr conn,
 
     /* Finally we can call the remote side's open function. */
     {
-        remote_open_args args = { &name, flags };
+        remote_connect_open_args args = { &name, flags };
 
         VIR_DEBUG("Trying to open URI %s", name);
-        if (call(conn, priv, 0, REMOTE_PROC_OPEN,
-                 (xdrproc_t) xdr_remote_open_args, (char *) &args,
+        if (call(conn, priv, 0, REMOTE_PROC_CONNECT_OPEN,
+                 (xdrproc_t) xdr_remote_connect_open_args, (char *) &args,
                  (xdrproc_t) xdr_void, (char *) NULL) == -1)
             goto failed;
     }
 
     /* Now try and find out what URI the daemon used */
     if (conn->uri == NULL) {
-        remote_get_uri_ret uriret;
+        remote_connect_get_uri_ret uriret;
 
         VIR_DEBUG("Trying to query remote URI");
         memset(&uriret, 0, sizeof(uriret));
         if (call(conn, priv, 0,
-                 REMOTE_PROC_GET_URI,
+                 REMOTE_PROC_CONNECT_GET_URI,
                  (xdrproc_t) xdr_void, (char *) NULL,
-                 (xdrproc_t) xdr_remote_get_uri_ret, (char *) &uriret) < 0)
+                 (xdrproc_t) xdr_remote_connect_get_uri_ret, (char *) &uriret) < 0)
             goto failed;
 
         VIR_DEBUG("Auto-probed URI is %s", uriret.uri);
@@ -1023,7 +1023,7 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv)
 {
     int ret = 0;
 
-    if (call(conn, priv, 0, REMOTE_PROC_CLOSE,
+    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_CLOSE,
              (xdrproc_t) xdr_void, (char *) NULL,
              (xdrproc_t) xdr_void, (char *) NULL) == -1)
         ret = -1;
@@ -1088,10 +1088,10 @@ remoteClose(virConnectPtr conn)
  * http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html
  */
 static const char *
-remoteType(virConnectPtr conn)
+remoteConnectGetType(virConnectPtr conn)
 {
     char *rv = NULL;
-    remote_get_type_ret ret;
+    remote_connect_get_type_ret ret;
     struct private_data *priv = conn->privateData;
 
     remoteDriverLock(priv);
@@ -1103,9 +1103,9 @@ remoteType(virConnectPtr conn)
     }
 
     memset(&ret, 0, sizeof(ret));
-    if (call(conn, priv, 0, REMOTE_PROC_GET_TYPE,
+    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_TYPE,
              (xdrproc_t) xdr_void, (char *) NULL,
-             (xdrproc_t) xdr_remote_get_type_ret, (char *) &ret) == -1)
+             (xdrproc_t) xdr_remote_connect_get_type_ret, (char *) &ret) == -1)
         goto done;
 
     /* Stash. */
@@ -1116,17 +1116,17 @@ done:
     return rv;
 }
 
-static int remoteIsSecure(virConnectPtr conn)
+static int remoteConnectIsSecure(virConnectPtr conn)
 {
     int rv = -1;
     struct private_data *priv = conn->privateData;
-    remote_is_secure_ret ret;
+    remote_connect_is_secure_ret ret;
     remoteDriverLock(priv);
 
     memset(&ret, 0, sizeof(ret));
-    if (call(conn, priv, 0, REMOTE_PROC_IS_SECURE,
+    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_IS_SECURE,
              (xdrproc_t) xdr_void, (char *) NULL,
-             (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1)
+             (xdrproc_t) xdr_remote_connect_is_secure_ret, (char *) &ret) == -1)
         goto done;
 
     /* We claim to be secure, if the remote driver
@@ -1144,18 +1144,18 @@ done:
     return rv;
 }
 
-static int remoteIsEncrypted(virConnectPtr conn)
+static int remoteConnectIsEncrypted(virConnectPtr conn)
 {
     int rv = -1;
     int encrypted = 0;
     struct private_data *priv = conn->privateData;
-    remote_is_secure_ret ret;
+    remote_connect_is_secure_ret ret;
     remoteDriverLock(priv);
 
     memset(&ret, 0, sizeof(ret));
-    if (call(conn, priv, 0, REMOTE_PROC_IS_SECURE,
+    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_IS_SECURE,
              (xdrproc_t) xdr_void, (char *) NULL,
-             (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1)
+             (xdrproc_t) xdr_remote_connect_is_secure_ret, (char *) &ret) == -1)
         goto done;
 
     if (virNetClientIsEncrypted(priv->client))
@@ -1348,12 +1348,12 @@ done:
 }
 
 static int
-remoteListDomains(virConnectPtr conn, int *ids, int maxids)
+remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids)
 {
     int rv = -1;
     int i;
-    remote_list_domains_args args;
-    remote_list_domains_ret ret;
+    remote_connect_list_domains_args args;
+    remote_connect_list_domains_ret ret;
     struct private_data *priv = conn->privateData;
 
     remoteDriverLock(priv);
@@ -1367,9 +1367,9 @@ remoteListDomains(virConnectPtr conn, int *ids, int maxids)
     args.maxids = maxids;
 
     memset(&ret, 0, sizeof(ret));
-    if (call(conn, priv, 0, REMOTE_PROC_LIST_DOMAINS,
-             (xdrproc_t) xdr_remote_list_domains_args, (char *) &args,
-             (xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret) == -1)
+    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_LIST_DOMAINS,
+             (xdrproc_t) xdr_remote_connect_list_domains_args, (char *) &args,
+             (xdrproc_t) xdr_remote_connect_list_domains_ret, (char *) &ret) == -1)
         goto done;
 
     if (ret.ids.ids_len > maxids) {
@@ -1385,7 +1385,7 @@ remoteListDomains(virConnectPtr conn, int *ids, int maxids)
     rv = ret.ids.ids_len;
 
 cleanup:
-    xdr_free((xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret);
+    xdr_free((xdrproc_t) xdr_remote_connect_list_domains_ret, (char *) &ret);
 
 done:
     remoteDriverUnlock(priv);
@@ -3204,14 +3204,14 @@ remoteStorageClose(virConnectPtr conn)
 }
 
 static char *
-remoteFindStoragePoolSources(virConnectPtr conn,
-                             const char *type,
-                             const char *srcSpec,
-                             unsigned int flags)
+remoteConnectFindStoragePoolSources(virConnectPtr conn,
+                                    const char *type,
+                                    const char *srcSpec,
+                                    unsigned int flags)
 {
     char *rv = NULL;
-    remote_find_storage_pool_sources_args args;
-    remote_find_storage_pool_sources_ret ret;
+    remote_connect_find_storage_pool_sources_args args;
+    remote_connect_find_storage_pool_sources_ret ret;
     struct private_data *priv = conn->storagePrivateData;
 
     remoteDriverLock(priv);
@@ -3221,15 +3221,15 @@ remoteFindStoragePoolSources(virConnectPtr conn,
     args.flags = flags;
 
     memset(&ret, 0, sizeof(ret));
-    if (call(conn, priv, 0, REMOTE_PROC_FIND_STORAGE_POOL_SOURCES,
-             (xdrproc_t) xdr_remote_find_storage_pool_sources_args, (char *) &args,
-             (xdrproc_t) xdr_remote_find_storage_pool_sources_ret, (char *) &ret) == -1)
+    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES,
+             (xdrproc_t) xdr_remote_connect_find_storage_pool_sources_args, (char *) &args,
+             (xdrproc_t) xdr_remote_connect_find_storage_pool_sources_ret, (char *) &ret) == -1)
         goto done;
 
     rv = ret.xml;
     ret.xml = NULL; /* To stop xdr_free free'ing it */
 
-    xdr_free((xdrproc_t) xdr_remote_find_storage_pool_sources_ret, (char *) &ret);
+    xdr_free((xdrproc_t) xdr_remote_connect_find_storage_pool_sources_ret, (char *) &ret);
 
 done:
     remoteDriverUnlock(priv);
@@ -4195,10 +4195,10 @@ out:
 #endif /* WITH_POLKIT */
 /*----------------------------------------------------------------------*/
 
-static int remoteDomainEventRegister(virConnectPtr conn,
-                                     virConnectDomainEventCallback callback,
-                                     void *opaque,
-                                     virFreeCallback freecb)
+static int remoteConnectDomainEventRegister(virConnectPtr conn,
+                                            virConnectDomainEventCallback callback,
+                                            void *opaque,
+                                            virFreeCallback freecb)
 {
     int rv = -1;
     struct private_data *priv = conn->privateData;
@@ -4214,7 +4214,7 @@ static int remoteDomainEventRegister(virConnectPtr conn,
 
     if (count == 1) {
         /* Tell the server when we are the first callback deregistering */
-        if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_REGISTER,
+        if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER,
                  (xdrproc_t) xdr_void, (char *) NULL,
                  (xdrproc_t) xdr_void, (char *) NULL) == -1)
             goto done;
@@ -4227,8 +4227,8 @@ done:
     return rv;
 }
 
-static int remoteDomainEventDeregister(virConnectPtr conn,
-                                       virConnectDomainEventCallback callback)
+static int remoteConnectDomainEventDeregister(virConnectPtr conn,
+                                              virConnectDomainEventCallback callback)
 {
     struct private_data *priv = conn->privateData;
     int rv = -1;
@@ -4243,7 +4243,7 @@ static int remoteDomainEventDeregister(virConnectPtr conn,
 
     if (count == 0) {
         /* Tell the server when we are the last callback deregistering */
-        if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER,
+        if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER,
                  (xdrproc_t) xdr_void, (char *) NULL,
                  (xdrproc_t) xdr_void, (char *) NULL) == -1)
             goto done;
@@ -4955,16 +4955,16 @@ static virStreamDriver remoteStreamDrv = {
 };
 
 
-static int remoteDomainEventRegisterAny(virConnectPtr conn,
-                                        virDomainPtr dom,
-                                        int eventID,
-                                        virConnectDomainEventGenericCallback callback,
-                                        void *opaque,
-                                        virFreeCallback freecb)
+static int remoteConnectDomainEventRegisterAny(virConnectPtr conn,
+                                               virDomainPtr dom,
+                                               int eventID,
+                                               virConnectDomainEventGenericCallback callback,
+                                               void *opaque,
+                                               virFreeCallback freecb)
 {
     int rv = -1;
     struct private_data *priv = conn->privateData;
-    remote_domain_events_register_any_args args;
+    remote_connect_domain_event_register_any_args args;
     int callbackID;
     int count;
 
@@ -4984,8 +4984,8 @@ static int remoteDomainEventRegisterAny(virConnectPtr conn,
     if (count == 1) {
         args.eventID = eventID;
 
-        if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY,
-                 (xdrproc_t) xdr_remote_domain_events_register_any_args, (char *) &args,
+        if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY,
+                 (xdrproc_t) xdr_remote_connect_domain_event_register_any_args, (char *) &args,
                  (xdrproc_t) xdr_void, (char *)NULL) == -1) {
             virDomainEventStateDeregisterID(conn,
                                             priv->domainEventState,
@@ -5002,12 +5002,12 @@ done:
 }
 
 
-static int remoteDomainEventDeregisterAny(virConnectPtr conn,
-                                          int callbackID)
+static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn,
+                                                 int callbackID)
 {
     struct private_data *priv = conn->privateData;
     int rv = -1;
-    remote_domain_events_deregister_any_args args;
+    remote_connect_domain_event_deregister_any_args args;
     int eventID;
     int count;
 
@@ -5032,8 +5032,8 @@ static int remoteDomainEventDeregisterAny(virConnectPtr conn,
     if (count == 0) {
         args.eventID = callbackID;
 
-        if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY,
-                 (xdrproc_t) xdr_remote_domain_events_deregister_any_args, (char *) &args,
+        if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY,
+                 (xdrproc_t) xdr_remote_connect_domain_event_deregister_any_args, (char *) &args,
                  (xdrproc_t) xdr_void, (char *) NULL) == -1)
             goto done;
     }
@@ -5053,8 +5053,8 @@ remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd,
                                char **result, unsigned int flags)
 {
     int rv = -1;
-    qemu_monitor_command_args args;
-    qemu_monitor_command_ret ret;
+    qemu_domain_monitor_command_args args;
+    qemu_domain_monitor_command_ret ret;
     struct private_data *priv = domain->conn->privateData;
 
     remoteDriverLock(priv);
@@ -5064,9 +5064,9 @@ remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd,
     args.flags = flags;
 
     memset(&ret, 0, sizeof(ret));
-    if (call(domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_MONITOR_COMMAND,
-             (xdrproc_t) xdr_qemu_monitor_command_args, (char *) &args,
-             (xdrproc_t) xdr_qemu_monitor_command_ret, (char *) &ret) == -1)
+    if (call(domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_DOMAIN_MONITOR_COMMAND,
+             (xdrproc_t) xdr_qemu_domain_monitor_command_args, (char *) &args,
+             (xdrproc_t) xdr_qemu_domain_monitor_command_ret, (char *) &ret) == -1)
         goto done;
 
     *result = strdup(ret.result);
@@ -5078,7 +5078,7 @@ remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd,
     rv = 0;
 
 cleanup:
-    xdr_free((xdrproc_t) xdr_qemu_monitor_command_ret, (char *) &ret);
+    xdr_free((xdrproc_t) xdr_qemu_domain_monitor_command_ret, (char *) &ret);
 
 done:
     remoteDriverUnlock(priv);
@@ -6122,17 +6122,17 @@ static virDriver remote_driver = {
     .name = "remote",
     .open = remoteOpen, /* 0.3.0 */
     .close = remoteClose, /* 0.3.0 */
-    .supports_feature = remoteSupportsFeature, /* 0.3.0 */
-    .type = remoteType, /* 0.3.0 */
-    .version = remoteGetVersion, /* 0.3.0 */
-    .libvirtVersion = remoteGetLibVersion, /* 0.7.3 */
-    .getHostname = remoteGetHostname, /* 0.3.0 */
-    .getSysinfo = remoteGetSysinfo, /* 0.8.8 */
-    .getMaxVcpus = remoteGetMaxVcpus, /* 0.3.0 */
+    .supports_feature = remoteConnectSupportsFeature, /* 0.3.0 */
+    .type = remoteConnectGetType, /* 0.3.0 */
+    .version = remoteConnectGetVersion, /* 0.3.0 */
+    .libvirtVersion = remoteConnectGetLibVersion, /* 0.7.3 */
+    .getHostname = remoteConnectGetHostname, /* 0.3.0 */
+    .getSysinfo = remoteConnectGetSysinfo, /* 0.8.8 */
+    .getMaxVcpus = remoteConnectGetMaxVcpus, /* 0.3.0 */
     .nodeGetInfo = remoteNodeGetInfo, /* 0.3.0 */
-    .getCapabilities = remoteGetCapabilities, /* 0.3.0 */
-    .listDomains = remoteListDomains, /* 0.3.0 */
-    .numOfDomains = remoteNumOfDomains, /* 0.3.0 */
+    .getCapabilities = remoteConnectGetCapabilities, /* 0.3.0 */
+    .listDomains = remoteConnectListDomains, /* 0.3.0 */
+    .numOfDomains = remoteConnectNumOfDomains, /* 0.3.0 */
     .listAllDomains = remoteConnectListAllDomains, /* 0.9.13 */
     .domainCreateXML = remoteDomainCreateXML, /* 0.3.0 */
     .domainLookupByID = remoteDomainLookupByID, /* 0.3.0 */
@@ -6182,10 +6182,10 @@ static virDriver remote_driver = {
     .domainGetSecurityLabelList = remoteDomainGetSecurityLabelList, /* 0.10.0 */
     .nodeGetSecurityModel = remoteNodeGetSecurityModel, /* 0.6.1 */
     .domainGetXMLDesc = remoteDomainGetXMLDesc, /* 0.3.0 */
-    .domainXMLFromNative = remoteDomainXMLFromNative, /* 0.6.4 */
-    .domainXMLToNative = remoteDomainXMLToNative, /* 0.6.4 */
-    .listDefinedDomains = remoteListDefinedDomains, /* 0.3.0 */
-    .numOfDefinedDomains = remoteNumOfDefinedDomains, /* 0.3.0 */
+    .domainXMLFromNative = remoteConnectDomainXMLFromNative, /* 0.6.4 */
+    .domainXMLToNative = remoteConnectDomainXMLToNative, /* 0.6.4 */
+    .listDefinedDomains = remoteConnectListDefinedDomains, /* 0.3.0 */
+    .numOfDefinedDomains = remoteConnectNumOfDefinedDomains, /* 0.3.0 */
     .domainCreate = remoteDomainCreate, /* 0.3.0 */
     .domainCreateWithFlags = remoteDomainCreateWithFlags, /* 0.8.2 */
     .domainDefineXML = remoteDomainDefineXML, /* 0.3.0 */
@@ -6220,21 +6220,21 @@ static virDriver remote_driver = {
     .nodeGetMemoryStats = remoteNodeGetMemoryStats, /* 0.9.3 */
     .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, /* 0.3.3 */
     .nodeGetFreeMemory = remoteNodeGetFreeMemory, /* 0.3.3 */
-    .domainEventRegister = remoteDomainEventRegister, /* 0.5.0 */
-    .domainEventDeregister = remoteDomainEventDeregister, /* 0.5.0 */
+    .domainEventRegister = remoteConnectDomainEventRegister, /* 0.5.0 */
+    .domainEventDeregister = remoteConnectDomainEventDeregister, /* 0.5.0 */
     .domainMigratePrepare2 = remoteDomainMigratePrepare2, /* 0.5.0 */
     .domainMigrateFinish2 = remoteDomainMigrateFinish2, /* 0.5.0 */
     .nodeDeviceDettach = remoteNodeDeviceDettach, /* 0.6.1 */
     .nodeDeviceReAttach = remoteNodeDeviceReAttach, /* 0.6.1 */
     .nodeDeviceReset = remoteNodeDeviceReset, /* 0.6.1 */
     .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel, /* 0.7.2 */
-    .isEncrypted = remoteIsEncrypted, /* 0.7.3 */
-    .isSecure = remoteIsSecure, /* 0.7.3 */
+    .isEncrypted = remoteConnectIsEncrypted, /* 0.7.3 */
+    .isSecure = remoteConnectIsSecure, /* 0.7.3 */
     .domainIsActive = remoteDomainIsActive, /* 0.7.3 */
     .domainIsPersistent = remoteDomainIsPersistent, /* 0.7.3 */
     .domainIsUpdated = remoteDomainIsUpdated, /* 0.8.6 */
-    .cpuCompare = remoteCPUCompare, /* 0.7.5 */
-    .cpuBaseline = remoteCPUBaseline, /* 0.7.7 */
+    .cpuCompare = remoteConnectCompareCPU, /* 0.7.5 */
+    .cpuBaseline = remoteConnectBaselineCPU, /* 0.7.7 */
     .domainGetJobInfo = remoteDomainGetJobInfo, /* 0.7.7 */
     .domainGetJobStats = remoteDomainGetJobStats, /* 1.0.3 */
     .domainAbortJob = remoteDomainAbortJob, /* 0.7.7 */
@@ -6243,8 +6243,8 @@ static virDriver remote_driver = {
     .domainMigrateSetCompressionCache = remoteDomainMigrateSetCompressionCache, /* 1.0.3 */
     .domainMigrateSetMaxSpeed = remoteDomainMigrateSetMaxSpeed, /* 0.9.0 */
     .domainMigrateGetMaxSpeed = remoteDomainMigrateGetMaxSpeed, /* 0.9.5 */
-    .domainEventRegisterAny = remoteDomainEventRegisterAny, /* 0.8.0 */
-    .domainEventDeregisterAny = remoteDomainEventDeregisterAny, /* 0.8.0 */
+    .domainEventRegisterAny = remoteConnectDomainEventRegisterAny, /* 0.8.0 */
+    .domainEventDeregisterAny = remoteConnectDomainEventDeregisterAny, /* 0.8.0 */
     .domainManagedSave = remoteDomainManagedSave, /* 0.8.0 */
     .domainHasManagedSaveImage = remoteDomainHasManagedSaveImage, /* 0.8.0 */
     .domainManagedSaveRemove = remoteDomainManagedSaveRemove, /* 0.8.0 */
@@ -6308,10 +6308,10 @@ static virNetworkDriver network_driver = {
     .name = "remote",
     .open = remoteNetworkOpen, /* 0.3.0 */
     .close = remoteNetworkClose, /* 0.3.0 */
-    .numOfNetworks = remoteNumOfNetworks, /* 0.3.0 */
-    .listNetworks = remoteListNetworks, /* 0.3.0 */
-    .numOfDefinedNetworks = remoteNumOfDefinedNetworks, /* 0.3.0 */
-    .listDefinedNetworks = remoteListDefinedNetworks, /* 0.3.0 */
+    .numOfNetworks = remoteConnectNumOfNetworks, /* 0.3.0 */
+    .listNetworks = remoteConnectListNetworks, /* 0.3.0 */
+    .numOfDefinedNetworks = remoteConnectNumOfDefinedNetworks, /* 0.3.0 */
+    .listDefinedNetworks = remoteConnectListDefinedNetworks, /* 0.3.0 */
     .listAllNetworks = remoteConnectListAllNetworks, /* 0.10.2 */
     .networkLookupByUUID = remoteNetworkLookupByUUID, /* 0.3.0 */
     .networkLookupByName = remoteNetworkLookupByName, /* 0.3.0 */
@@ -6333,10 +6333,10 @@ static virInterfaceDriver interface_driver = {
     .name = "remote",
     .open = remoteInterfaceOpen, /* 0.7.2 */
     .close = remoteInterfaceClose, /* 0.7.2 */
-    .numOfInterfaces = remoteNumOfInterfaces, /* 0.7.2 */
-    .listInterfaces = remoteListInterfaces, /* 0.7.2 */
-    .numOfDefinedInterfaces = remoteNumOfDefinedInterfaces, /* 0.7.2 */
-    .listDefinedInterfaces = remoteListDefinedInterfaces, /* 0.7.2 */
+    .numOfInterfaces = remoteConnectNumOfInterfaces, /* 0.7.2 */
+    .listInterfaces = remoteConnectListInterfaces, /* 0.7.2 */
+    .numOfDefinedInterfaces = remoteConnectNumOfDefinedInterfaces, /* 0.7.2 */
+    .listDefinedInterfaces = remoteConnectListDefinedInterfaces, /* 0.7.2 */
     .listAllInterfaces = remoteConnectListAllInterfaces, /* 0.10.2 */
     .interfaceLookupByName = remoteInterfaceLookupByName, /* 0.7.2 */
     .interfaceLookupByMACString = remoteInterfaceLookupByMACString, /* 0.7.2 */
@@ -6355,12 +6355,12 @@ static virStorageDriver storage_driver = {
     .name = "remote",
     .open = remoteStorageOpen, /* 0.4.1 */
     .close = remoteStorageClose, /* 0.4.1 */
-    .numOfPools = remoteNumOfStoragePools, /* 0.4.1 */
-    .listPools = remoteListStoragePools, /* 0.4.1 */
-    .numOfDefinedPools = remoteNumOfDefinedStoragePools, /* 0.4.1 */
-    .listDefinedPools = remoteListDefinedStoragePools, /* 0.4.1 */
+    .numOfPools = remoteConnectNumOfStoragePools, /* 0.4.1 */
+    .listPools = remoteConnectListStoragePools, /* 0.4.1 */
+    .numOfDefinedPools = remoteConnectNumOfDefinedStoragePools, /* 0.4.1 */
+    .listDefinedPools = remoteConnectListDefinedStoragePools, /* 0.4.1 */
     .listAllPools = remoteConnectListAllStoragePools, /* 0.10.2 */
-    .findPoolSources = remoteFindStoragePoolSources, /* 0.4.5 */
+    .findPoolSources = remoteConnectFindStoragePoolSources, /* 0.4.5 */
     .poolLookupByName = remoteStoragePoolLookupByName, /* 0.4.1 */
     .poolLookupByUUID = remoteStoragePoolLookupByUUID, /* 0.4.1 */
     .poolLookupByVolume = remoteStoragePoolLookupByVolume, /* 0.4.1 */
@@ -6402,8 +6402,8 @@ static virSecretDriver secret_driver = {
     .name = "remote",
     .open = remoteSecretOpen, /* 0.7.1 */
     .close = remoteSecretClose, /* 0.7.1 */
-    .numOfSecrets = remoteNumOfSecrets, /* 0.7.1 */
-    .listSecrets = remoteListSecrets, /* 0.7.1 */
+    .numOfSecrets = remoteConnectNumOfSecrets, /* 0.7.1 */
+    .listSecrets = remoteConnectListSecrets, /* 0.7.1 */
     .listAllSecrets = remoteConnectListAllSecrets, /* 0.10.2 */
     .lookupByUUID = remoteSecretLookupByUUID, /* 0.7.1 */
     .lookupByUsage = remoteSecretLookupByUsage, /* 0.7.1 */
@@ -6440,8 +6440,8 @@ static virNWFilterDriver nwfilter_driver = {
     .getXMLDesc           = remoteNWFilterGetXMLDesc, /* 0.8.0 */
     .defineXML            = remoteNWFilterDefineXML, /* 0.8.0 */
     .undefine             = remoteNWFilterUndefine, /* 0.8.0 */
-    .numOfNWFilters       = remoteNumOfNWFilters, /* 0.8.0 */
-    .listNWFilters        = remoteListNWFilters, /* 0.8.0 */
+    .numOfNWFilters       = remoteConnectNumOfNWFilters, /* 0.8.0 */
+    .listNWFilters        = remoteConnectListNWFilters, /* 0.8.0 */
     .listAllNWFilters     = remoteConnectListAllNWFilters, /* 0.10.2 */
 };
 
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index e531b97..486d640 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -401,7 +401,7 @@ struct remote_domain_disk_error {
  * Dynamic opaque and remote_nonnull_string arrays can be annotated with an
  * optional typecast */
 
-struct remote_open_args {
+struct remote_connect_open_args {
     /* NB. "name" might be NULL although in practice you can't
      * yet do that using the remote_internal driver.
      */
@@ -409,50 +409,50 @@ struct remote_open_args {
     unsigned int flags;
 };
 
-struct remote_supports_feature_args {
+struct remote_connect_supports_feature_args {
     int feature;
 };
 
-struct remote_supports_feature_ret {
+struct remote_connect_supports_feature_ret {
     int supported;
 };
 
-struct remote_get_type_ret {
+struct remote_connect_get_type_ret {
     remote_nonnull_string type;
 };
 
-struct remote_get_version_ret {
+struct remote_connect_get_version_ret {
     unsigned hyper hv_ver;
 };
 
-struct remote_get_lib_version_ret {
+struct remote_connect_get_lib_version_ret {
     unsigned hyper lib_ver;
 };
 
-struct remote_get_hostname_ret {
+struct remote_connect_get_hostname_ret {
     remote_nonnull_string hostname;
 };
 
-struct remote_get_sysinfo_args {
+struct remote_connect_get_sysinfo_args {
     unsigned int flags;
 };
 
-struct remote_get_sysinfo_ret {
+struct remote_connect_get_sysinfo_ret {
     remote_nonnull_string sysinfo;
 };
 
-struct remote_get_uri_ret {
+struct remote_connect_get_uri_ret {
     remote_nonnull_string uri;
 };
 
-struct remote_get_max_vcpus_args {
+struct remote_connect_get_max_vcpus_args {
     /* The only backend which supports this call is Xen HV, and
      * there the type is ignored so it could be NULL.
      */
     remote_string type;
 };
 
-struct remote_get_max_vcpus_ret {
+struct remote_connect_get_max_vcpus_ret {
     int max_vcpus;
 };
 
@@ -467,7 +467,7 @@ struct remote_node_get_info_ret { /* insert 1 */
     int threads;
 };
 
-struct remote_get_capabilities_ret {
+struct remote_connect_get_capabilities_ret {
     remote_nonnull_string capabilities;
 };
 
@@ -713,15 +713,15 @@ struct remote_domain_get_block_info_ret { /* insert 2 */
     unsigned hyper physical;
 };
 
-struct remote_list_domains_args {
+struct remote_connect_list_domains_args {
     int maxids;
 };
 
-struct remote_list_domains_ret {
+struct remote_connect_list_domains_ret {
     int ids<REMOTE_DOMAIN_ID_LIST_MAX>; /* insert 1 */
 };
 
-struct remote_num_of_domains_ret {
+struct remote_connect_num_of_domains_ret {
     int num;
 };
 
@@ -964,15 +964,15 @@ struct remote_domain_migrate_finish2_ret {
     remote_nonnull_domain ddom;
 };
 
-struct remote_list_defined_domains_args {
+struct remote_connect_list_defined_domains_args {
     int maxnames;
 };
 
-struct remote_list_defined_domains_ret {
+struct remote_connect_list_defined_domains_ret {
     remote_nonnull_string names<REMOTE_DOMAIN_NAME_LIST_MAX>; /* insert 1 */
 };
 
-struct remote_num_of_defined_domains_ret {
+struct remote_connect_num_of_defined_domains_ret {
     int num;
 };
 
@@ -1283,27 +1283,27 @@ struct remote_domain_get_hostname_ret {
 
 /* Network calls: */
 
-struct remote_num_of_networks_ret {
+struct remote_connect_num_of_networks_ret {
     int num;
 };
 
-struct remote_list_networks_args {
+struct remote_connect_list_networks_args {
     int maxnames;
 };
 
-struct remote_list_networks_ret {
+struct remote_connect_list_networks_ret {
     remote_nonnull_string names<REMOTE_NETWORK_NAME_LIST_MAX>; /* insert 1 */
 };
 
-struct remote_num_of_defined_networks_ret {
+struct remote_connect_num_of_defined_networks_ret {
     int num;
 };
 
-struct remote_list_defined_networks_args {
+struct remote_connect_list_defined_networks_args {
     int maxnames;
 };
 
-struct remote_list_defined_networks_ret {
+struct remote_connect_list_defined_networks_ret {
     remote_nonnull_string names<REMOTE_NETWORK_NAME_LIST_MAX>; /* insert 1 */
 };
 
@@ -1392,15 +1392,15 @@ struct remote_network_set_autostart_args {
 
 /* network filter calls */
 
-struct remote_num_of_nwfilters_ret {
+struct remote_connect_num_of_nwfilters_ret {
     int num;
 };
 
-struct remote_list_nwfilters_args {
+struct remote_connect_list_nwfilters_args {
     int maxnames;
 };
 
-struct remote_list_nwfilters_ret {
+struct remote_connect_list_nwfilters_ret {
     remote_nonnull_string names<REMOTE_NWFILTER_NAME_LIST_MAX>; /* insert 1 */
 };
 
@@ -1444,27 +1444,27 @@ struct remote_nwfilter_get_xml_desc_ret {
 
 /* Interface calls: */
 
-struct remote_num_of_interfaces_ret {
+struct remote_connect_num_of_interfaces_ret {
     int num;
 };
 
-struct remote_list_interfaces_args {
+struct remote_connect_list_interfaces_args {
     int maxnames;
 };
 
-struct remote_list_interfaces_ret {
+struct remote_connect_list_interfaces_ret {
     remote_nonnull_string names<REMOTE_INTERFACE_NAME_LIST_MAX>; /* insert 1 */
 };
 
-struct remote_num_of_defined_interfaces_ret {
+struct remote_connect_num_of_defined_interfaces_ret {
     int num;
 };
 
-struct remote_list_defined_interfaces_args {
+struct remote_connect_list_defined_interfaces_args {
     int maxnames;
 };
 
-struct remote_list_defined_interfaces_ret {
+struct remote_connect_list_defined_interfaces_ret {
     remote_nonnull_string names<REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX>; /* insert 1 */
 };
 
@@ -1570,37 +1570,37 @@ struct remote_auth_polkit_ret {
 
 /* Storage pool calls: */
 
-struct remote_num_of_storage_pools_ret {
+struct remote_connect_num_of_storage_pools_ret {
     int num;
 };
 
-struct remote_list_storage_pools_args {
+struct remote_connect_list_storage_pools_args {
     int maxnames;
 };
 
-struct remote_list_storage_pools_ret {
+struct remote_connect_list_storage_pools_ret {
     remote_nonnull_string names<REMOTE_STORAGE_POOL_NAME_LIST_MAX>; /* insert 1 */
 };
 
-struct remote_num_of_defined_storage_pools_ret {
+struct remote_connect_num_of_defined_storage_pools_ret {
     int num;
 };
 
-struct remote_list_defined_storage_pools_args {
+struct remote_connect_list_defined_storage_pools_args {
     int maxnames;
 };
 
-struct remote_list_defined_storage_pools_ret {
+struct remote_connect_list_defined_storage_pools_ret {
     remote_nonnull_string names<REMOTE_STORAGE_POOL_NAME_LIST_MAX>; /* insert 1 */
 };
 
-struct remote_find_storage_pool_sources_args {
+struct remote_connect_find_storage_pool_sources_args {
     remote_nonnull_string type;
     remote_string srcSpec;
     unsigned int flags;
 };
 
-struct remote_find_storage_pool_sources_ret {
+struct remote_connect_find_storage_pool_sources_ret {
     remote_nonnull_string xml;
 };
 
@@ -1928,11 +1928,11 @@ struct remote_node_device_destroy_args {
  * to be null. It will not generate the prototype otherwise.
  * Pass back a redundant boolean to force prototype generation.
  */
-struct remote_domain_events_register_ret {
+struct remote_connect_domain_event_register_ret {
     int cb_registered;
 };
 
-struct remote_domain_events_deregister_ret {
+struct remote_connect_domain_event_deregister_ret {
     int cb_registered;
 };
 
@@ -1943,37 +1943,37 @@ struct remote_domain_event_lifecycle_msg {
 };
 
 
-struct remote_domain_xml_from_native_args {
+struct remote_connect_domain_xml_from_native_args {
     remote_nonnull_string nativeFormat;
     remote_nonnull_string nativeConfig;
     unsigned int flags;
 };
 
-struct remote_domain_xml_from_native_ret {
+struct remote_connect_domain_xml_from_native_ret {
     remote_nonnull_string domainXml;
 };
 
 
-struct remote_domain_xml_to_native_args {
+struct remote_connect_domain_xml_to_native_args {
     remote_nonnull_string nativeFormat;
     remote_nonnull_string domainXml;
     unsigned int flags;
 };
 
-struct remote_domain_xml_to_native_ret {
+struct remote_connect_domain_xml_to_native_ret {
     remote_nonnull_string nativeConfig;
 };
 
 
-struct remote_num_of_secrets_ret {
+struct remote_connect_num_of_secrets_ret {
     int num;
 };
 
-struct remote_list_secrets_args {
+struct remote_connect_list_secrets_args {
     int maxuuids;
 };
 
-struct remote_list_secrets_ret {
+struct remote_connect_list_secrets_ret {
     remote_nonnull_string uuids<REMOTE_SECRET_UUID_LIST_MAX>; /* insert 1 */
 };
 
@@ -2039,7 +2039,7 @@ struct remote_domain_migrate_prepare_tunnel_args {
 };
 
 
-struct remote_is_secure_ret {
+struct remote_connect_is_secure_ret {
     int secure;
 };
 
@@ -2112,22 +2112,22 @@ struct remote_interface_is_active_ret {
 };
 
 
-struct remote_cpu_compare_args {
+struct remote_connect_compare_cpu_args {
     remote_nonnull_string xml;
     unsigned int flags;
 };
 
-struct remote_cpu_compare_ret {
+struct remote_connect_compare_cpu_ret {
     int result;
 };
 
 
-struct remote_cpu_baseline_args {
+struct remote_connect_baseline_cpu_args {
     remote_nonnull_string xmlCPUs<REMOTE_CPU_BASELINE_MAX>; /* (const char **) */
     unsigned int flags;
 };
 
-struct remote_cpu_baseline_ret {
+struct remote_connect_baseline_cpu_ret {
     remote_nonnull_string cpu;
 };
 
@@ -2209,11 +2209,11 @@ struct remote_domain_migrate_get_max_speed_ret {
 };
 
 
-struct remote_domain_events_register_any_args {
+struct remote_connect_domain_event_register_any_args {
     int eventID;
 };
 
-struct remote_domain_events_deregister_any_args {
+struct remote_connect_domain_event_deregister_any_args {
     int eventID;
 };
 
@@ -2775,31 +2775,31 @@ enum remote_procedure {
      * @generate: none
      * @priority: high
      */
-    REMOTE_PROC_OPEN = 1,
+    REMOTE_PROC_CONNECT_OPEN = 1,
 
     /**
      * @generate: none
      * @priority: high
      */
-    REMOTE_PROC_CLOSE = 2,
+    REMOTE_PROC_CONNECT_CLOSE = 2,
 
     /**
      * @generate: server
      * @priority: high
      */
-    REMOTE_PROC_GET_TYPE = 3,
+    REMOTE_PROC_CONNECT_GET_TYPE = 3,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_GET_VERSION = 4,
+    REMOTE_PROC_CONNECT_GET_VERSION = 4,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_GET_MAX_VCPUS = 5,
+    REMOTE_PROC_CONNECT_GET_MAX_VCPUS = 5,
 
     /**
      * @generate: both
@@ -2810,7 +2810,7 @@ enum remote_procedure {
     /**
      * @generate: both
      */
-    REMOTE_PROC_GET_CAPABILITIES = 7,
+    REMOTE_PROC_CONNECT_GET_CAPABILITIES = 7,
 
     /**
      * @generate: both
@@ -2888,7 +2888,7 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_DEFINED_DOMAINS = 21,
+    REMOTE_PROC_CONNECT_LIST_DEFINED_DOMAINS = 21,
 
     /**
      * @generate: both
@@ -2912,7 +2912,7 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_DEFINED_DOMAINS = 25,
+    REMOTE_PROC_CONNECT_NUM_OF_DEFINED_DOMAINS = 25,
 
     /**
      * @generate: both
@@ -2971,19 +2971,19 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_DEFINED_NETWORKS = 36,
+    REMOTE_PROC_CONNECT_LIST_DEFINED_NETWORKS = 36,
 
     /**
      * @generate: server
      * @priority: high
      */
-    REMOTE_PROC_LIST_DOMAINS = 37,
+    REMOTE_PROC_CONNECT_LIST_DOMAINS = 37,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_NETWORKS = 38,
+    REMOTE_PROC_CONNECT_LIST_NETWORKS = 38,
 
     /**
      * @generate: both
@@ -3053,19 +3053,19 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_DEFINED_NETWORKS = 50,
+    REMOTE_PROC_CONNECT_NUM_OF_DEFINED_NETWORKS = 50,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_DOMAINS = 51,
+    REMOTE_PROC_CONNECT_NUM_OF_DOMAINS = 51,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_NETWORKS = 52,
+    REMOTE_PROC_CONNECT_NUM_OF_NETWORKS = 52,
 
     /**
      * @generate: both
@@ -3101,13 +3101,13 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_GET_HOSTNAME = 59,
+    REMOTE_PROC_CONNECT_GET_HOSTNAME = 59,
 
     /**
      * @generate: client
      * @priority: high
      */
-    REMOTE_PROC_SUPPORTS_FEATURE = 60,
+    REMOTE_PROC_CONNECT_SUPPORTS_FEATURE = 60,
 
     /**
      * @generate: none
@@ -3169,30 +3169,30 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_STORAGE_POOLS = 71,
+    REMOTE_PROC_CONNECT_NUM_OF_STORAGE_POOLS = 71,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_STORAGE_POOLS = 72,
+    REMOTE_PROC_CONNECT_LIST_STORAGE_POOLS = 72,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_DEFINED_STORAGE_POOLS = 73,
+    REMOTE_PROC_CONNECT_NUM_OF_DEFINED_STORAGE_POOLS = 73,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_DEFINED_STORAGE_POOLS = 74,
+    REMOTE_PROC_CONNECT_LIST_DEFINED_STORAGE_POOLS = 74,
 
     /**
      * @generate: server
      */
-    REMOTE_PROC_FIND_STORAGE_POOL_SOURCES = 75,
+    REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES = 75,
 
     /**
      * @generate: both
@@ -3363,13 +3363,13 @@ enum remote_procedure {
      * @generate: none
      * @priority: high
      */
-    REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105,
+    REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER = 105,
 
     /**
      * @generate: none
      * @priority: high
      */
-    REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106,
+    REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER = 106,
 
     /**
      * @generate: both
@@ -3390,7 +3390,7 @@ enum remote_procedure {
      * @generate: server
      * @priority: high
      */
-    REMOTE_PROC_GET_URI = 110,
+    REMOTE_PROC_CONNECT_GET_URI = 110,
 
     /**
      * @generate: both
@@ -3480,13 +3480,13 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_INTERFACES = 126,
+    REMOTE_PROC_CONNECT_NUM_OF_INTERFACES = 126,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_INTERFACES = 127,
+    REMOTE_PROC_CONNECT_LIST_INTERFACES = 127,
 
     /**
      * @generate: both
@@ -3531,36 +3531,36 @@ enum remote_procedure {
     /**
      * @generate: both
      */
-    REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 135,
+    REMOTE_PROC_CONNECT_DOMAIN_XML_FROM_NATIVE = 135,
 
     /**
      * @generate: both
      */
-    REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 136,
+    REMOTE_PROC_CONNECT_DOMAIN_XML_TO_NATIVE = 136,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_DEFINED_INTERFACES = 137,
+    REMOTE_PROC_CONNECT_NUM_OF_DEFINED_INTERFACES = 137,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_DEFINED_INTERFACES = 138,
+    REMOTE_PROC_CONNECT_LIST_DEFINED_INTERFACES = 138,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_SECRETS = 139,
+    REMOTE_PROC_CONNECT_NUM_OF_SECRETS = 139,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_SECRETS = 140,
+    REMOTE_PROC_CONNECT_LIST_SECRETS = 140,
 
     /**
      * @generate: both
@@ -3614,7 +3614,7 @@ enum remote_procedure {
      * @generate: server
      * @priority: high
      */
-    REMOTE_PROC_IS_SECURE = 149,
+    REMOTE_PROC_CONNECT_IS_SECURE = 149,
 
     /**
      * @generate: both
@@ -3662,13 +3662,13 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_GET_LIB_VERSION = 157,
+    REMOTE_PROC_CONNECT_GET_LIB_VERSION = 157,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_CPU_COMPARE = 158,
+    REMOTE_PROC_CONNECT_COMPARE_CPU = 158,
 
     /**
      * @generate: none
@@ -3688,7 +3688,7 @@ enum remote_procedure {
     /**
      * @generate: both
      */
-    REMOTE_PROC_CPU_BASELINE = 162,
+    REMOTE_PROC_CONNECT_BASELINE_CPU = 162,
 
     /**
      * @generate: both
@@ -3714,13 +3714,13 @@ enum remote_procedure {
      * @generate: none
      * @priority: high
      */
-    REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY = 167,
+    REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY = 167,
 
     /**
      * @generate: none
      * @priority: high
      */
-    REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY = 168,
+    REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY = 168,
 
     /**
      * @generate: both
@@ -3774,13 +3774,13 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_NUM_OF_NWFILTERS = 178,
+    REMOTE_PROC_CONNECT_NUM_OF_NWFILTERS = 178,
 
     /**
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_LIST_NWFILTERS = 179,
+    REMOTE_PROC_CONNECT_LIST_NWFILTERS = 179,
 
     /**
      * @generate: both
@@ -3909,7 +3909,7 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      */
-    REMOTE_PROC_GET_SYSINFO = 203,
+    REMOTE_PROC_CONNECT_GET_SYSINFO = 203,
 
     /**
      * @generate: both
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index c85defd..11a53a2 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -98,41 +98,41 @@ struct remote_domain_disk_error {
         remote_nonnull_string      disk;
         int                        error;
 };
-struct remote_open_args {
+struct remote_connect_open_args {
         remote_string              name;
         u_int                      flags;
 };
-struct remote_supports_feature_args {
+struct remote_connect_supports_feature_args {
         int                        feature;
 };
-struct remote_supports_feature_ret {
+struct remote_connect_supports_feature_ret {
         int                        supported;
 };
-struct remote_get_type_ret {
+struct remote_connect_get_type_ret {
         remote_nonnull_string      type;
 };
-struct remote_get_version_ret {
+struct remote_connect_get_version_ret {
         uint64_t                   hv_ver;
 };
-struct remote_get_lib_version_ret {
+struct remote_connect_get_lib_version_ret {
         uint64_t                   lib_ver;
 };
-struct remote_get_hostname_ret {
+struct remote_connect_get_hostname_ret {
         remote_nonnull_string      hostname;
 };
-struct remote_get_sysinfo_args {
+struct remote_connect_get_sysinfo_args {
         u_int                      flags;
 };
-struct remote_get_sysinfo_ret {
+struct remote_connect_get_sysinfo_ret {
         remote_nonnull_string      sysinfo;
 };
-struct remote_get_uri_ret {
+struct remote_connect_get_uri_ret {
         remote_nonnull_string      uri;
 };
-struct remote_get_max_vcpus_args {
+struct remote_connect_get_max_vcpus_args {
         remote_string              type;
 };
-struct remote_get_max_vcpus_ret {
+struct remote_connect_get_max_vcpus_ret {
         int                        max_vcpus;
 };
 struct remote_node_get_info_ret {
@@ -145,7 +145,7 @@ struct remote_node_get_info_ret {
         int                        cores;
         int                        threads;
 };
-struct remote_get_capabilities_ret {
+struct remote_connect_get_capabilities_ret {
         remote_nonnull_string      capabilities;
 };
 struct remote_node_get_cpu_stats_args {
@@ -404,16 +404,16 @@ struct remote_domain_get_block_info_ret {
         uint64_t                   capacity;
         uint64_t                   physical;
 };
-struct remote_list_domains_args {
+struct remote_connect_list_domains_args {
         int                        maxids;
 };
-struct remote_list_domains_ret {
+struct remote_connect_list_domains_ret {
         struct {
                 u_int              ids_len;
                 int *              ids_val;
         } ids;
 };
-struct remote_num_of_domains_ret {
+struct remote_connect_num_of_domains_ret {
         int                        num;
 };
 struct remote_domain_create_xml_args {
@@ -623,16 +623,16 @@ struct remote_domain_migrate_finish2_args {
 struct remote_domain_migrate_finish2_ret {
         remote_nonnull_domain      ddom;
 };
-struct remote_list_defined_domains_args {
+struct remote_connect_list_defined_domains_args {
         int                        maxnames;
 };
-struct remote_list_defined_domains_ret {
+struct remote_connect_list_defined_domains_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
         } names;
 };
-struct remote_num_of_defined_domains_ret {
+struct remote_connect_num_of_defined_domains_ret {
         int                        num;
 };
 struct remote_domain_create_args {
@@ -932,25 +932,25 @@ struct remote_domain_get_hostname_args {
 struct remote_domain_get_hostname_ret {
         remote_nonnull_string      hostname;
 };
-struct remote_num_of_networks_ret {
+struct remote_connect_num_of_networks_ret {
         int                        num;
 };
-struct remote_list_networks_args {
+struct remote_connect_list_networks_args {
         int                        maxnames;
 };
-struct remote_list_networks_ret {
+struct remote_connect_list_networks_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
         } names;
 };
-struct remote_num_of_defined_networks_ret {
+struct remote_connect_num_of_defined_networks_ret {
         int                        num;
 };
-struct remote_list_defined_networks_args {
+struct remote_connect_list_defined_networks_args {
         int                        maxnames;
 };
-struct remote_list_defined_networks_ret {
+struct remote_connect_list_defined_networks_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
@@ -1020,13 +1020,13 @@ struct remote_network_set_autostart_args {
         remote_nonnull_network     net;
         int                        autostart;
 };
-struct remote_num_of_nwfilters_ret {
+struct remote_connect_num_of_nwfilters_ret {
         int                        num;
 };
-struct remote_list_nwfilters_args {
+struct remote_connect_list_nwfilters_args {
         int                        maxnames;
 };
-struct remote_list_nwfilters_ret {
+struct remote_connect_list_nwfilters_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
@@ -1060,25 +1060,25 @@ struct remote_nwfilter_get_xml_desc_args {
 struct remote_nwfilter_get_xml_desc_ret {
         remote_nonnull_string      xml;
 };
-struct remote_num_of_interfaces_ret {
+struct remote_connect_num_of_interfaces_ret {
         int                        num;
 };
-struct remote_list_interfaces_args {
+struct remote_connect_list_interfaces_args {
         int                        maxnames;
 };
-struct remote_list_interfaces_ret {
+struct remote_connect_list_interfaces_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
         } names;
 };
-struct remote_num_of_defined_interfaces_ret {
+struct remote_connect_num_of_defined_interfaces_ret {
         int                        num;
 };
-struct remote_list_defined_interfaces_args {
+struct remote_connect_list_defined_interfaces_args {
         int                        maxnames;
 };
-struct remote_list_defined_interfaces_ret {
+struct remote_connect_list_defined_interfaces_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
@@ -1173,36 +1173,36 @@ struct remote_auth_sasl_step_ret {
 struct remote_auth_polkit_ret {
         int                        complete;
 };
-struct remote_num_of_storage_pools_ret {
+struct remote_connect_num_of_storage_pools_ret {
         int                        num;
 };
-struct remote_list_storage_pools_args {
+struct remote_connect_list_storage_pools_args {
         int                        maxnames;
 };
-struct remote_list_storage_pools_ret {
+struct remote_connect_list_storage_pools_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
         } names;
 };
-struct remote_num_of_defined_storage_pools_ret {
+struct remote_connect_num_of_defined_storage_pools_ret {
         int                        num;
 };
-struct remote_list_defined_storage_pools_args {
+struct remote_connect_list_defined_storage_pools_args {
         int                        maxnames;
 };
-struct remote_list_defined_storage_pools_ret {
+struct remote_connect_list_defined_storage_pools_ret {
         struct {
                 u_int              names_len;
                 remote_nonnull_string * names_val;
         } names;
 };
-struct remote_find_storage_pool_sources_args {
+struct remote_connect_find_storage_pool_sources_args {
         remote_nonnull_string      type;
         remote_string              srcSpec;
         u_int                      flags;
 };
-struct remote_find_storage_pool_sources_ret {
+struct remote_connect_find_storage_pool_sources_ret {
         remote_nonnull_string      xml;
 };
 struct remote_storage_pool_lookup_by_uuid_args {
@@ -1456,10 +1456,10 @@ struct remote_node_device_create_xml_ret {
 struct remote_node_device_destroy_args {
         remote_nonnull_string      name;
 };
-struct remote_domain_events_register_ret {
+struct remote_connect_domain_event_register_ret {
         int                        cb_registered;
 };
-struct remote_domain_events_deregister_ret {
+struct remote_connect_domain_event_deregister_ret {
         int                        cb_registered;
 };
 struct remote_domain_event_lifecycle_msg {
@@ -1467,29 +1467,29 @@ struct remote_domain_event_lifecycle_msg {
         int                        event;
         int                        detail;
 };
-struct remote_domain_xml_from_native_args {
+struct remote_connect_domain_xml_from_native_args {
         remote_nonnull_string      nativeFormat;
         remote_nonnull_string      nativeConfig;
         u_int                      flags;
 };
-struct remote_domain_xml_from_native_ret {
+struct remote_connect_domain_xml_from_native_ret {
         remote_nonnull_string      domainXml;
 };
-struct remote_domain_xml_to_native_args {
+struct remote_connect_domain_xml_to_native_args {
         remote_nonnull_string      nativeFormat;
         remote_nonnull_string      domainXml;
         u_int                      flags;
 };
-struct remote_domain_xml_to_native_ret {
+struct remote_connect_domain_xml_to_native_ret {
         remote_nonnull_string      nativeConfig;
 };
-struct remote_num_of_secrets_ret {
+struct remote_connect_num_of_secrets_ret {
         int                        num;
 };
-struct remote_list_secrets_args {
+struct remote_connect_list_secrets_args {
         int                        maxuuids;
 };
-struct remote_list_secrets_ret {
+struct remote_connect_list_secrets_ret {
         struct {
                 u_int              uuids_len;
                 remote_nonnull_string * uuids_val;
@@ -1549,7 +1549,7 @@ struct remote_domain_migrate_prepare_tunnel_args {
         uint64_t                   resource;
         remote_nonnull_string      dom_xml;
 };
-struct remote_is_secure_ret {
+struct remote_connect_is_secure_ret {
         int                        secure;
 };
 struct remote_domain_is_active_args {
@@ -1600,21 +1600,21 @@ struct remote_interface_is_active_args {
 struct remote_interface_is_active_ret {
         int                        active;
 };
-struct remote_cpu_compare_args {
+struct remote_connect_compare_cpu_args {
         remote_nonnull_string      xml;
         u_int                      flags;
 };
-struct remote_cpu_compare_ret {
+struct remote_connect_compare_cpu_ret {
         int                        result;
 };
-struct remote_cpu_baseline_args {
+struct remote_connect_baseline_cpu_args {
         struct {
                 u_int              xmlCPUs_len;
                 remote_nonnull_string * xmlCPUs_val;
         } xmlCPUs;
         u_int                      flags;
 };
-struct remote_cpu_baseline_ret {
+struct remote_connect_baseline_cpu_ret {
         remote_nonnull_string      cpu;
 };
 struct remote_domain_get_job_info_args {
@@ -1677,10 +1677,10 @@ struct remote_domain_migrate_get_max_speed_args {
 struct remote_domain_migrate_get_max_speed_ret {
         uint64_t                   bandwidth;
 };
-struct remote_domain_events_register_any_args {
+struct remote_connect_domain_event_register_any_args {
         int                        eventID;
 };
-struct remote_domain_events_deregister_any_args {
+struct remote_connect_domain_event_deregister_any_args {
         int                        eventID;
 };
 struct remote_domain_event_reboot_msg {
@@ -2188,13 +2188,13 @@ struct remote_domain_fstrim_args {
         u_int                      flags;
 };
 enum remote_procedure {
-        REMOTE_PROC_OPEN = 1,
-        REMOTE_PROC_CLOSE = 2,
-        REMOTE_PROC_GET_TYPE = 3,
-        REMOTE_PROC_GET_VERSION = 4,
-        REMOTE_PROC_GET_MAX_VCPUS = 5,
+        REMOTE_PROC_CONNECT_OPEN = 1,
+        REMOTE_PROC_CONNECT_CLOSE = 2,
+        REMOTE_PROC_CONNECT_GET_TYPE = 3,
+        REMOTE_PROC_CONNECT_GET_VERSION = 4,
+        REMOTE_PROC_CONNECT_GET_MAX_VCPUS = 5,
         REMOTE_PROC_NODE_GET_INFO = 6,
-        REMOTE_PROC_GET_CAPABILITIES = 7,
+        REMOTE_PROC_CONNECT_GET_CAPABILITIES = 7,
         REMOTE_PROC_DOMAIN_ATTACH_DEVICE = 8,
         REMOTE_PROC_DOMAIN_CREATE = 9,
         REMOTE_PROC_DOMAIN_CREATE_XML = 10,
@@ -2208,11 +2208,11 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_GET_MAX_VCPUS = 18,
         REMOTE_PROC_DOMAIN_GET_OS_TYPE = 19,
         REMOTE_PROC_DOMAIN_GET_VCPUS = 20,
-        REMOTE_PROC_LIST_DEFINED_DOMAINS = 21,
+        REMOTE_PROC_CONNECT_LIST_DEFINED_DOMAINS = 21,
         REMOTE_PROC_DOMAIN_LOOKUP_BY_ID = 22,
         REMOTE_PROC_DOMAIN_LOOKUP_BY_NAME = 23,
         REMOTE_PROC_DOMAIN_LOOKUP_BY_UUID = 24,
-        REMOTE_PROC_NUM_OF_DEFINED_DOMAINS = 25,
+        REMOTE_PROC_CONNECT_NUM_OF_DEFINED_DOMAINS = 25,
         REMOTE_PROC_DOMAIN_PIN_VCPU = 26,
         REMOTE_PROC_DOMAIN_REBOOT = 27,
         REMOTE_PROC_DOMAIN_RESUME = 28,
@@ -2223,9 +2223,9 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_SHUTDOWN = 33,
         REMOTE_PROC_DOMAIN_SUSPEND = 34,
         REMOTE_PROC_DOMAIN_UNDEFINE = 35,
-        REMOTE_PROC_LIST_DEFINED_NETWORKS = 36,
-        REMOTE_PROC_LIST_DOMAINS = 37,
-        REMOTE_PROC_LIST_NETWORKS = 38,
+        REMOTE_PROC_CONNECT_LIST_DEFINED_NETWORKS = 36,
+        REMOTE_PROC_CONNECT_LIST_DOMAINS = 37,
+        REMOTE_PROC_CONNECT_LIST_NETWORKS = 38,
         REMOTE_PROC_NETWORK_CREATE = 39,
         REMOTE_PROC_NETWORK_CREATE_XML = 40,
         REMOTE_PROC_NETWORK_DEFINE_XML = 41,
@@ -2237,17 +2237,17 @@ enum remote_procedure {
         REMOTE_PROC_NETWORK_LOOKUP_BY_UUID = 47,
         REMOTE_PROC_NETWORK_SET_AUTOSTART = 48,
         REMOTE_PROC_NETWORK_UNDEFINE = 49,
-        REMOTE_PROC_NUM_OF_DEFINED_NETWORKS = 50,
-        REMOTE_PROC_NUM_OF_DOMAINS = 51,
-        REMOTE_PROC_NUM_OF_NETWORKS = 52,
+        REMOTE_PROC_CONNECT_NUM_OF_DEFINED_NETWORKS = 50,
+        REMOTE_PROC_CONNECT_NUM_OF_DOMAINS = 51,
+        REMOTE_PROC_CONNECT_NUM_OF_NETWORKS = 52,
         REMOTE_PROC_DOMAIN_CORE_DUMP = 53,
         REMOTE_PROC_DOMAIN_RESTORE = 54,
         REMOTE_PROC_DOMAIN_SAVE = 55,
         REMOTE_PROC_DOMAIN_GET_SCHEDULER_TYPE = 56,
         REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS = 57,
         REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS = 58,
-        REMOTE_PROC_GET_HOSTNAME = 59,
-        REMOTE_PROC_SUPPORTS_FEATURE = 60,
+        REMOTE_PROC_CONNECT_GET_HOSTNAME = 59,
+        REMOTE_PROC_CONNECT_SUPPORTS_FEATURE = 60,
         REMOTE_PROC_DOMAIN_MIGRATE_PREPARE = 61,
         REMOTE_PROC_DOMAIN_MIGRATE_PERFORM = 62,
         REMOTE_PROC_DOMAIN_MIGRATE_FINISH = 63,
@@ -2258,11 +2258,11 @@ enum remote_procedure {
         REMOTE_PROC_AUTH_SASL_START = 68,
         REMOTE_PROC_AUTH_SASL_STEP = 69,
         REMOTE_PROC_AUTH_POLKIT = 70,
-        REMOTE_PROC_NUM_OF_STORAGE_POOLS = 71,
-        REMOTE_PROC_LIST_STORAGE_POOLS = 72,
-        REMOTE_PROC_NUM_OF_DEFINED_STORAGE_POOLS = 73,
-        REMOTE_PROC_LIST_DEFINED_STORAGE_POOLS = 74,
-        REMOTE_PROC_FIND_STORAGE_POOL_SOURCES = 75,
+        REMOTE_PROC_CONNECT_NUM_OF_STORAGE_POOLS = 71,
+        REMOTE_PROC_CONNECT_LIST_STORAGE_POOLS = 72,
+        REMOTE_PROC_CONNECT_NUM_OF_DEFINED_STORAGE_POOLS = 73,
+        REMOTE_PROC_CONNECT_LIST_DEFINED_STORAGE_POOLS = 74,
+        REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES = 75,
         REMOTE_PROC_STORAGE_POOL_CREATE_XML = 76,
         REMOTE_PROC_STORAGE_POOL_DEFINE_XML = 77,
         REMOTE_PROC_STORAGE_POOL_CREATE = 78,
@@ -2292,12 +2292,12 @@ enum remote_procedure {
         REMOTE_PROC_NODE_GET_FREE_MEMORY = 102,
         REMOTE_PROC_DOMAIN_BLOCK_PEEK = 103,
         REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104,
-        REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105,
-        REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106,
+        REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER = 105,
+        REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER = 106,
         REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE = 107,
         REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108,
         REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109,
-        REMOTE_PROC_GET_URI = 110,
+        REMOTE_PROC_CONNECT_GET_URI = 110,
         REMOTE_PROC_NODE_NUM_OF_DEVICES = 111,
         REMOTE_PROC_NODE_LIST_DEVICES = 112,
         REMOTE_PROC_NODE_DEVICE_LOOKUP_BY_NAME = 113,
@@ -2313,8 +2313,8 @@ enum remote_procedure {
         REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123,
         REMOTE_PROC_NODE_DEVICE_DESTROY = 124,
         REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125,
-        REMOTE_PROC_NUM_OF_INTERFACES = 126,
-        REMOTE_PROC_LIST_INTERFACES = 127,
+        REMOTE_PROC_CONNECT_NUM_OF_INTERFACES = 126,
+        REMOTE_PROC_CONNECT_LIST_INTERFACES = 127,
         REMOTE_PROC_INTERFACE_LOOKUP_BY_NAME = 128,
         REMOTE_PROC_INTERFACE_LOOKUP_BY_MAC_STRING = 129,
         REMOTE_PROC_INTERFACE_GET_XML_DESC = 130,
@@ -2322,12 +2322,12 @@ enum remote_procedure {
         REMOTE_PROC_INTERFACE_UNDEFINE = 132,
         REMOTE_PROC_INTERFACE_CREATE = 133,
         REMOTE_PROC_INTERFACE_DESTROY = 134,
-        REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 135,
-        REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 136,
-        REMOTE_PROC_NUM_OF_DEFINED_INTERFACES = 137,
-        REMOTE_PROC_LIST_DEFINED_INTERFACES = 138,
-        REMOTE_PROC_NUM_OF_SECRETS = 139,
-        REMOTE_PROC_LIST_SECRETS = 140,
+        REMOTE_PROC_CONNECT_DOMAIN_XML_FROM_NATIVE = 135,
+        REMOTE_PROC_CONNECT_DOMAIN_XML_TO_NATIVE = 136,
+        REMOTE_PROC_CONNECT_NUM_OF_DEFINED_INTERFACES = 137,
+        REMOTE_PROC_CONNECT_LIST_DEFINED_INTERFACES = 138,
+        REMOTE_PROC_CONNECT_NUM_OF_SECRETS = 139,
+        REMOTE_PROC_CONNECT_LIST_SECRETS = 140,
         REMOTE_PROC_SECRET_LOOKUP_BY_UUID = 141,
         REMOTE_PROC_SECRET_DEFINE_XML = 142,
         REMOTE_PROC_SECRET_GET_XML_DESC = 143,
@@ -2336,7 +2336,7 @@ enum remote_procedure {
         REMOTE_PROC_SECRET_UNDEFINE = 146,
         REMOTE_PROC_SECRET_LOOKUP_BY_USAGE = 147,
         REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL = 148,
-        REMOTE_PROC_IS_SECURE = 149,
+        REMOTE_PROC_CONNECT_IS_SECURE = 149,
         REMOTE_PROC_DOMAIN_IS_ACTIVE = 150,
         REMOTE_PROC_DOMAIN_IS_PERSISTENT = 151,
         REMOTE_PROC_NETWORK_IS_ACTIVE = 152,
@@ -2344,18 +2344,18 @@ enum remote_procedure {
         REMOTE_PROC_STORAGE_POOL_IS_ACTIVE = 154,
         REMOTE_PROC_STORAGE_POOL_IS_PERSISTENT = 155,
         REMOTE_PROC_INTERFACE_IS_ACTIVE = 156,
-        REMOTE_PROC_GET_LIB_VERSION = 157,
-        REMOTE_PROC_CPU_COMPARE = 158,
+        REMOTE_PROC_CONNECT_GET_LIB_VERSION = 157,
+        REMOTE_PROC_CONNECT_COMPARE_CPU = 158,
         REMOTE_PROC_DOMAIN_MEMORY_STATS = 159,
         REMOTE_PROC_DOMAIN_ATTACH_DEVICE_FLAGS = 160,
         REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS = 161,
-        REMOTE_PROC_CPU_BASELINE = 162,
+        REMOTE_PROC_CONNECT_BASELINE_CPU = 162,
         REMOTE_PROC_DOMAIN_GET_JOB_INFO = 163,
         REMOTE_PROC_DOMAIN_ABORT_JOB = 164,
         REMOTE_PROC_STORAGE_VOL_WIPE = 165,
         REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_DOWNTIME = 166,
-        REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY = 167,
-        REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY = 168,
+        REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY = 167,
+        REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY = 168,
         REMOTE_PROC_DOMAIN_EVENT_REBOOT = 169,
         REMOTE_PROC_DOMAIN_EVENT_RTC_CHANGE = 170,
         REMOTE_PROC_DOMAIN_EVENT_WATCHDOG = 171,
@@ -2365,8 +2365,8 @@ enum remote_procedure {
         REMOTE_PROC_NWFILTER_LOOKUP_BY_NAME = 175,
         REMOTE_PROC_NWFILTER_LOOKUP_BY_UUID = 176,
         REMOTE_PROC_NWFILTER_GET_XML_DESC = 177,
-        REMOTE_PROC_NUM_OF_NWFILTERS = 178,
-        REMOTE_PROC_LIST_NWFILTERS = 179,
+        REMOTE_PROC_CONNECT_NUM_OF_NWFILTERS = 178,
+        REMOTE_PROC_CONNECT_LIST_NWFILTERS = 179,
         REMOTE_PROC_NWFILTER_DEFINE_XML = 180,
         REMOTE_PROC_NWFILTER_UNDEFINE = 181,
         REMOTE_PROC_DOMAIN_MANAGED_SAVE = 182,
@@ -2390,7 +2390,7 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200,
         REMOTE_PROC_DOMAIN_OPEN_CONSOLE = 201,
         REMOTE_PROC_DOMAIN_IS_UPDATED = 202,
-        REMOTE_PROC_GET_SYSINFO = 203,
+        REMOTE_PROC_CONNECT_GET_SYSINFO = 203,
         REMOTE_PROC_DOMAIN_SET_MEMORY_FLAGS = 204,
         REMOTE_PROC_DOMAIN_SET_BLKIO_PARAMETERS = 205,
         REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS = 206,
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index fdc345f..7bbc76a 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -293,8 +293,8 @@ my $long_legacy = {
     DomainSetMaxMemory          => { arg => { memory => 1 } },
     DomainSetMemory             => { arg => { memory => 1 } },
     DomainSetMemoryFlags        => { arg => { memory => 1 } },
-    GetLibVersion               => { ret => { lib_ver => 1 } },
-    GetVersion                  => { ret => { hv_ver => 1 } },
+    ConnectGetLibVersion        => { ret => { lib_ver => 1 } },
+    ConnectGetVersion           => { ret => { hv_ver => 1 } },
     NodeGetInfo                 => { ret => { memory => 1 } },
     DomainBlockCommit           => { arg => { bandwidth => 1 } },
     DomainBlockPull             => { arg => { bandwidth => 1 } },
@@ -606,7 +606,7 @@ elsif ($mode eq "server") {
                     # error out on unannotated arrays
                     die "remote_nonnull_string array without insert@<offset> annotation: $ret_member";
                 } elsif ($ret_member =~ m/^remote_nonnull_string (\S+);/) {
-                    if ($call->{ProcName} eq "GetType") {
+                    if ($call->{ProcName} eq "ConnectGetType") {
                         # SPECIAL: virConnectGetType returns a constant string that must
                         #          not be freed. Therefore, duplicate the string here.
                         push(@vars_list, "const char *$1");
@@ -893,28 +893,14 @@ elsif ($mode eq "server") {
 
             if (! @args_list) {
                 push(@args_list, "priv->conn");
-
-                if ($call->{ProcName} ne "NodeGetFreeMemory") {
-                    $prefix = "Connect"
-                }
             }
 
-            if ($call->{ProcName} eq "GetSysinfo" or
-                $call->{ProcName} eq "GetMaxVcpus" or
-                $call->{ProcName} eq "DomainXMLFromNative" or
-                $call->{ProcName} eq "DomainXMLToNative" or
-                $call->{ProcName} eq "FindStoragePoolSources" or
-                $call->{ProcName} =~ m/^List/) {
-                $prefix = "Connect"
-            } elsif ($call->{ProcName} eq "SupportsFeature") {
-                $prefix = "Drv"
-            } elsif ($call->{ProcName} eq "CPUBaseline") {
-                $proc_name = "ConnectBaselineCPU"
-            } elsif ($call->{ProcName} eq "CPUCompare") {
-                $proc_name = "ConnectCompareCPU"
-            } elsif ($structprefix eq "qemu" && $call->{ProcName} =~ /^Domain/) {
+            if ($structprefix eq "qemu" && $call->{ProcName} =~ /^Domain/) {
                 $proc_name =~ s/^(Domain)/${1}Qemu/;
             }
+            if ($structprefix eq "lxc" && $call->{ProcName} =~ /^Domain/) {
+                $proc_name =~ s/^(Domain)/${1}Lxc/;
+            }
 
             if ($single_ret_as_list) {
                 print "    /* Allocate return buffer. */\n";
@@ -1538,6 +1524,9 @@ elsif ($mode eq "client") {
         if ($structprefix eq "qemu") {
             $callflags = "REMOTE_CALL_QEMU";
         }
+        if ($structprefix eq "lxc") {
+            $callflags = "REMOTE_CALL_LXC";
+        }
 
         print "\n";
         print "    if (call($priv_src, priv, $callflags, $call->{constname},\n";
-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]