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

[libvirt] [PATCH 04/22] remote generator, daemon: Change capitalization of some words



Again this will simplify the generator, due to less special case handling.
---
 daemon/remote.c                     |   64 +++++++++---------
 daemon/remote_dispatch_bodies.c     |   64 +++++++++---------
 daemon/remote_dispatch_prototypes.h |   64 +++++++++---------
 daemon/remote_dispatch_table.h      |  128 +++++++++++++++++-----------------
 daemon/remote_generator.pl          |    3 +-
 5 files changed, 162 insertions(+), 161 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index 48dbcc5..5057cfc 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -607,7 +607,7 @@ cleanup:
 }
 
 static int
-remoteDispatchGetUri(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchGetURI(struct qemud_server *server ATTRIBUTE_UNUSED,
                      struct qemud_client *client ATTRIBUTE_UNUSED,
                      virConnectPtr conn,
                      remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -1320,7 +1320,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainCreateXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                               struct qemud_client *client ATTRIBUTE_UNUSED,
                               virConnectPtr conn,
                               remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -1352,7 +1352,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainDefineXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                               struct qemud_client *client ATTRIBUTE_UNUSED,
                               virConnectPtr conn,
                               remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -1384,7 +1384,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainDumpXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                             struct qemud_client *client ATTRIBUTE_UNUSED,
                             virConnectPtr conn,
                             remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -1418,7 +1418,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainXmlFromNative(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainXMLFromNative(struct qemud_server *server ATTRIBUTE_UNUSED,
                                   struct qemud_client *client ATTRIBUTE_UNUSED,
                                   virConnectPtr conn,
                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -1449,7 +1449,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainXmlToNative(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainXMLToNative(struct qemud_server *server ATTRIBUTE_UNUSED,
                                 struct qemud_client *client ATTRIBUTE_UNUSED,
                                 virConnectPtr conn,
                                 remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -2235,7 +2235,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainLookupByUUID(struct qemud_server *server ATTRIBUTE_UNUSED,
                                  struct qemud_client *client ATTRIBUTE_UNUSED,
                                  virConnectPtr conn,
                                  remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -2934,7 +2934,7 @@ cleanup:
 }
 
 static int
-remoteDispatchNetworkCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNetworkCreateXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                struct qemud_client *client ATTRIBUTE_UNUSED,
                                virConnectPtr conn,
                                remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -2966,7 +2966,7 @@ cleanup:
 }
 
 static int
-remoteDispatchNetworkDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNetworkDefineXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                struct qemud_client *client ATTRIBUTE_UNUSED,
                                virConnectPtr conn,
                                remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -2998,7 +2998,7 @@ cleanup:
 }
 
 static int
-remoteDispatchNetworkDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNetworkDumpXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                              struct qemud_client *client ATTRIBUTE_UNUSED,
                              virConnectPtr conn,
                              remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -3131,7 +3131,7 @@ cleanup:
 }
 
 static int
-remoteDispatchNetworkLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNetworkLookupByUUID(struct qemud_server *server ATTRIBUTE_UNUSED,
                                   struct qemud_client *client ATTRIBUTE_UNUSED,
                                   virConnectPtr conn,
                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -3460,7 +3460,7 @@ cleanup:
 }
 
 static int
-remoteDispatchInterfaceGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchInterfaceGetXMLDesc(struct qemud_server *server ATTRIBUTE_UNUSED,
                                   struct qemud_client *client ATTRIBUTE_UNUSED,
                                   virConnectPtr conn,
                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -3494,7 +3494,7 @@ cleanup:
 }
 
 static int
-remoteDispatchInterfaceDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchInterfaceDefineXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                  struct qemud_client *client ATTRIBUTE_UNUSED,
                                  virConnectPtr conn,
                                  remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4452,7 +4452,7 @@ cleanup:
 }
 
 static int
-remoteDispatchStoragePoolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStoragePoolCreateXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                    struct qemud_client *client ATTRIBUTE_UNUSED,
                                    virConnectPtr conn,
                                    remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4484,7 +4484,7 @@ cleanup:
 }
 
 static int
-remoteDispatchStoragePoolDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStoragePoolDefineXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                    struct qemud_client *client ATTRIBUTE_UNUSED,
                                    virConnectPtr conn,
                                    remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4555,7 +4555,7 @@ cleanup:
 }
 
 static int
-remoteDispatchStoragePoolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStoragePoolDumpXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                  struct qemud_client *client ATTRIBUTE_UNUSED,
                                  virConnectPtr conn,
                                  remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4655,7 +4655,7 @@ cleanup:
 }
 
 static int
-remoteDispatchStoragePoolLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStoragePoolLookupByUUID(struct qemud_server *server ATTRIBUTE_UNUSED,
                                       struct qemud_client *client ATTRIBUTE_UNUSED,
                                       virConnectPtr conn,
                                       remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4871,7 +4871,7 @@ cleanup:
 
 
 static int
-remoteDispatchStorageVolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStorageVolCreateXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                   struct qemud_client *client ATTRIBUTE_UNUSED,
                                   virConnectPtr conn,
                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4908,7 +4908,7 @@ cleanup:
 }
 
 static int
-remoteDispatchStorageVolCreateXmlFrom(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStorageVolCreateXMLFrom(struct qemud_server *server ATTRIBUTE_UNUSED,
                                       struct qemud_client *client ATTRIBUTE_UNUSED,
                                       virConnectPtr conn,
                                       remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -4990,7 +4990,7 @@ cleanup:
 }
 
 static int
-remoteDispatchStorageVolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchStorageVolDumpXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                 struct qemud_client *client ATTRIBUTE_UNUSED,
                                 virConnectPtr conn,
                                 remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -5278,7 +5278,7 @@ cleanup:
 
 
 static int
-remoteDispatchNodeDeviceDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNodeDeviceDumpXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                 struct qemud_client *client ATTRIBUTE_UNUSED,
                                 virConnectPtr conn,
                                 remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -5449,7 +5449,7 @@ cleanup:
 }
 
 static int
-remoteDispatchNodeDeviceCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNodeDeviceCreateXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                   struct qemud_client *client ATTRIBUTE_UNUSED,
                                   virConnectPtr conn,
                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -5783,7 +5783,7 @@ cleanup:
 }
 
 static int
-remoteDispatchSecretDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchSecretDefineXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                               struct qemud_client *client ATTRIBUTE_UNUSED,
                               virConnectPtr conn,
                               remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -5852,7 +5852,7 @@ cleanup:
 }
 
 static int
-remoteDispatchSecretGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchSecretGetXMLDesc(struct qemud_server *server ATTRIBUTE_UNUSED,
                                struct qemud_client *client ATTRIBUTE_UNUSED,
                                virConnectPtr conn,
                                remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -5884,7 +5884,7 @@ cleanup:
 }
 
 static int
-remoteDispatchSecretLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchSecretLookupByUUID(struct qemud_server *server ATTRIBUTE_UNUSED,
                                  struct qemud_client *client ATTRIBUTE_UNUSED,
                                  virConnectPtr conn,
                                  remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6344,7 +6344,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainSnapshotCreateXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                       struct qemud_client *client ATTRIBUTE_UNUSED,
                                       virConnectPtr conn,
                                       remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6382,7 +6382,7 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainSnapshotDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainSnapshotDumpXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                     struct qemud_client *client ATTRIBUTE_UNUSED,
                                     virConnectPtr conn,
                                     remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6741,7 +6741,7 @@ cleanup:
 }
 
 static int
-remoteDispatchNWFilterLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNWFilterLookupByUUID(struct qemud_server *server ATTRIBUTE_UNUSED,
                                    struct qemud_client *client ATTRIBUTE_UNUSED,
                                    virConnectPtr conn,
                                    remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6774,7 +6774,7 @@ cleanup:
 
 
 static int
-remoteDispatchNWFilterDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNWFilterDefineXML(struct qemud_server *server ATTRIBUTE_UNUSED,
                                 struct qemud_client *client ATTRIBUTE_UNUSED,
                                 virConnectPtr conn,
                                 remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6806,7 +6806,7 @@ cleanup:
 }
 
 static int
-remoteDispatchListNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchListNWFilters(struct qemud_server *server ATTRIBUTE_UNUSED,
                             struct qemud_client *client ATTRIBUTE_UNUSED,
                             virConnectPtr conn,
                             remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6852,7 +6852,7 @@ cleanup:
 
 
 static int
-remoteDispatchNWFilterGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNWFilterGetXMLDesc(struct qemud_server *server ATTRIBUTE_UNUSED,
                                  struct qemud_client *client ATTRIBUTE_UNUSED,
                                  virConnectPtr conn,
                                  remote_message_header *hdr ATTRIBUTE_UNUSED,
@@ -6887,7 +6887,7 @@ cleanup:
 
 
 static int
-remoteDispatchNumOfNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchNumOfNWFilters(struct qemud_server *server ATTRIBUTE_UNUSED,
                              struct qemud_client *client ATTRIBUTE_UNUSED,
                              virConnectPtr conn,
                              remote_message_header *hdr ATTRIBUTE_UNUSED,
diff --git a/daemon/remote_dispatch_bodies.c b/daemon/remote_dispatch_bodies.c
index a3360c5..6b4abec 100644
--- a/daemon/remote_dispatch_bodies.c
+++ b/daemon/remote_dispatch_bodies.c
@@ -194,9 +194,9 @@ cleanup:
 
 /* remoteDispatchDomainCreateWithFlags has to be implemented manually */
 
-/* remoteDispatchDomainCreateXml has to be implemented manually */
+/* remoteDispatchDomainCreateXML has to be implemented manually */
 
-/* remoteDispatchDomainDefineXml has to be implemented manually */
+/* remoteDispatchDomainDefineXML has to be implemented manually */
 
 static int
 remoteDispatchDomainDestroy(
@@ -300,7 +300,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchDomainDumpXml has to be implemented manually */
+/* remoteDispatchDomainDumpXML has to be implemented manually */
 
 /* remoteDispatchDomainEventsDeregister has to be implemented manually */
 
@@ -354,7 +354,7 @@ cleanup:
 
 /* remoteDispatchDomainLookupByName has to be implemented manually */
 
-/* remoteDispatchDomainLookupByUuid has to be implemented manually */
+/* remoteDispatchDomainLookupByUUID has to be implemented manually */
 
 static int
 remoteDispatchDomainManagedSave(
@@ -928,7 +928,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchDomainSnapshotCreateXml has to be implemented manually */
+/* remoteDispatchDomainSnapshotCreateXML has to be implemented manually */
 
 /* remoteDispatchDomainSnapshotCurrent has to be implemented manually */
 
@@ -972,7 +972,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchDomainSnapshotDumpXml has to be implemented manually */
+/* remoteDispatchDomainSnapshotDumpXML has to be implemented manually */
 
 /* remoteDispatchDomainSnapshotListNames has to be implemented manually */
 
@@ -1082,9 +1082,9 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchDomainXmlFromNative has to be implemented manually */
+/* remoteDispatchDomainXMLFromNative has to be implemented manually */
 
-/* remoteDispatchDomainXmlToNative has to be implemented manually */
+/* remoteDispatchDomainXMLToNative has to be implemented manually */
 
 /* remoteDispatchFindStoragePoolSources has to be implemented manually */
 
@@ -1100,7 +1100,7 @@ cleanup:
 
 /* remoteDispatchGetType has to be implemented manually */
 
-/* remoteDispatchGetUri has to be implemented manually */
+/* remoteDispatchGetURI has to be implemented manually */
 
 /* remoteDispatchGetVersion has to be implemented manually */
 
@@ -1138,7 +1138,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchInterfaceDefineXml has to be implemented manually */
+/* remoteDispatchInterfaceDefineXML has to be implemented manually */
 
 static int
 remoteDispatchInterfaceDestroy(
@@ -1174,7 +1174,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchInterfaceGetXmlDesc has to be implemented manually */
+/* remoteDispatchInterfaceGetXMLDesc has to be implemented manually */
 
 /* remoteDispatchInterfaceIsActive has to be implemented manually */
 
@@ -1232,7 +1232,7 @@ cleanup:
 
 /* remoteDispatchListNetworks has to be implemented manually */
 
-/* remoteDispatchListNwfilters has to be implemented manually */
+/* remoteDispatchListNWFilters has to be implemented manually */
 
 /* remoteDispatchListSecrets has to be implemented manually */
 
@@ -1272,9 +1272,9 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchNetworkCreateXml has to be implemented manually */
+/* remoteDispatchNetworkCreateXML has to be implemented manually */
 
-/* remoteDispatchNetworkDefineXml has to be implemented manually */
+/* remoteDispatchNetworkDefineXML has to be implemented manually */
 
 static int
 remoteDispatchNetworkDestroy(
@@ -1310,7 +1310,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchNetworkDumpXml has to be implemented manually */
+/* remoteDispatchNetworkDumpXML has to be implemented manually */
 
 /* remoteDispatchNetworkGetAutostart has to be implemented manually */
 
@@ -1322,7 +1322,7 @@ cleanup:
 
 /* remoteDispatchNetworkLookupByName has to be implemented manually */
 
-/* remoteDispatchNetworkLookupByUuid has to be implemented manually */
+/* remoteDispatchNetworkLookupByUUID has to be implemented manually */
 
 static int
 remoteDispatchNetworkSetAutostart(
@@ -1392,7 +1392,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchNodeDeviceCreateXml has to be implemented manually */
+/* remoteDispatchNodeDeviceCreateXML has to be implemented manually */
 
 static int
 remoteDispatchNodeDeviceDestroy(
@@ -1462,7 +1462,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchNodeDeviceDumpXml has to be implemented manually */
+/* remoteDispatchNodeDeviceDumpXML has to be implemented manually */
 
 /* remoteDispatchNodeDeviceGetParent has to be implemented manually */
 
@@ -1566,19 +1566,19 @@ cleanup:
 
 /* remoteDispatchNumOfNetworks has to be implemented manually */
 
-/* remoteDispatchNumOfNwfilters has to be implemented manually */
+/* remoteDispatchNumOfNWFilters has to be implemented manually */
 
 /* remoteDispatchNumOfSecrets has to be implemented manually */
 
 /* remoteDispatchNumOfStoragePools has to be implemented manually */
 
-/* remoteDispatchNWFilterDefineXml has to be implemented manually */
+/* remoteDispatchNWFilterDefineXML has to be implemented manually */
 
-/* remoteDispatchNWFilterGetXmlDesc has to be implemented manually */
+/* remoteDispatchNWFilterGetXMLDesc has to be implemented manually */
 
 /* remoteDispatchNWFilterLookupByName has to be implemented manually */
 
-/* remoteDispatchNWFilterLookupByUuid has to be implemented manually */
+/* remoteDispatchNWFilterLookupByUUID has to be implemented manually */
 
 static int
 remoteDispatchNWFilterUndefine(
@@ -1616,15 +1616,15 @@ cleanup:
 
 /* remoteDispatchOpen has to be implemented manually */
 
-/* remoteDispatchSecretDefineXml has to be implemented manually */
+/* remoteDispatchSecretDefineXML has to be implemented manually */
 
 /* remoteDispatchSecretGetValue has to be implemented manually */
 
-/* remoteDispatchSecretGetXmlDesc has to be implemented manually */
+/* remoteDispatchSecretGetXMLDesc has to be implemented manually */
 
 /* remoteDispatchSecretLookupByUsage has to be implemented manually */
 
-/* remoteDispatchSecretLookupByUuid has to be implemented manually */
+/* remoteDispatchSecretLookupByUUID has to be implemented manually */
 
 static int
 remoteDispatchSecretSetValue(
@@ -1762,9 +1762,9 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchStoragePoolCreateXml has to be implemented manually */
+/* remoteDispatchStoragePoolCreateXML has to be implemented manually */
 
-/* remoteDispatchStoragePoolDefineXml has to be implemented manually */
+/* remoteDispatchStoragePoolDefineXML has to be implemented manually */
 
 static int
 remoteDispatchStoragePoolDelete(
@@ -1834,7 +1834,7 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchStoragePoolDumpXml has to be implemented manually */
+/* remoteDispatchStoragePoolDumpXML has to be implemented manually */
 
 /* remoteDispatchStoragePoolGetAutostart has to be implemented manually */
 
@@ -1848,7 +1848,7 @@ cleanup:
 
 /* remoteDispatchStoragePoolLookupByName has to be implemented manually */
 
-/* remoteDispatchStoragePoolLookupByUuid has to be implemented manually */
+/* remoteDispatchStoragePoolLookupByUUID has to be implemented manually */
 
 /* remoteDispatchStoragePoolLookupByVolume has to be implemented manually */
 
@@ -1956,9 +1956,9 @@ cleanup:
     return rv;
 }
 
-/* remoteDispatchStorageVolCreateXml has to be implemented manually */
+/* remoteDispatchStorageVolCreateXML has to be implemented manually */
 
-/* remoteDispatchStorageVolCreateXmlFrom has to be implemented manually */
+/* remoteDispatchStorageVolCreateXMLFrom has to be implemented manually */
 
 static int
 remoteDispatchStorageVolDelete(
@@ -1996,7 +1996,7 @@ cleanup:
 
 /* remoteDispatchStorageVolDownload has to be implemented manually */
 
-/* remoteDispatchStorageVolDumpXml has to be implemented manually */
+/* remoteDispatchStorageVolDumpXML has to be implemented manually */
 
 /* remoteDispatchStorageVolGetInfo has to be implemented manually */
 
diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
index 29ae5ba..dff84d7 100644
--- a/daemon/remote_dispatch_prototypes.h
+++ b/daemon/remote_dispatch_prototypes.h
@@ -130,7 +130,7 @@ static int remoteDispatchDomainCreateWithFlags(
     remote_error *rerr,
     remote_domain_create_with_flags_args *args,
     remote_domain_create_with_flags_ret *ret);
-static int remoteDispatchDomainCreateXml(
+static int remoteDispatchDomainCreateXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -138,7 +138,7 @@ static int remoteDispatchDomainCreateXml(
     remote_error *rerr,
     remote_domain_create_xml_args *args,
     remote_domain_create_xml_ret *ret);
-static int remoteDispatchDomainDefineXml(
+static int remoteDispatchDomainDefineXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -170,7 +170,7 @@ static int remoteDispatchDomainDetachDeviceFlags(
     remote_error *rerr,
     remote_domain_detach_device_flags_args *args,
     void *ret);
-static int remoteDispatchDomainDumpXml(
+static int remoteDispatchDomainDumpXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -386,7 +386,7 @@ static int remoteDispatchDomainLookupByName(
     remote_error *rerr,
     remote_domain_lookup_by_name_args *args,
     remote_domain_lookup_by_name_ret *ret);
-static int remoteDispatchDomainLookupByUuid(
+static int remoteDispatchDomainLookupByUUID(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -626,7 +626,7 @@ static int remoteDispatchDomainShutdown(
     remote_error *rerr,
     remote_domain_shutdown_args *args,
     void *ret);
-static int remoteDispatchDomainSnapshotCreateXml(
+static int remoteDispatchDomainSnapshotCreateXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -650,7 +650,7 @@ static int remoteDispatchDomainSnapshotDelete(
     remote_error *rerr,
     remote_domain_snapshot_delete_args *args,
     void *ret);
-static int remoteDispatchDomainSnapshotDumpXml(
+static int remoteDispatchDomainSnapshotDumpXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -706,7 +706,7 @@ static int remoteDispatchDomainUpdateDeviceFlags(
     remote_error *rerr,
     remote_domain_update_device_flags_args *args,
     void *ret);
-static int remoteDispatchDomainXmlFromNative(
+static int remoteDispatchDomainXMLFromNative(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -714,7 +714,7 @@ static int remoteDispatchDomainXmlFromNative(
     remote_error *rerr,
     remote_domain_xml_from_native_args *args,
     remote_domain_xml_from_native_ret *ret);
-static int remoteDispatchDomainXmlToNative(
+static int remoteDispatchDomainXMLToNative(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -778,7 +778,7 @@ static int remoteDispatchGetType(
     remote_error *rerr,
     void *args,
     remote_get_type_ret *ret);
-static int remoteDispatchGetUri(
+static int remoteDispatchGetURI(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -802,7 +802,7 @@ static int remoteDispatchInterfaceCreate(
     remote_error *rerr,
     remote_interface_create_args *args,
     void *ret);
-static int remoteDispatchInterfaceDefineXml(
+static int remoteDispatchInterfaceDefineXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -818,7 +818,7 @@ static int remoteDispatchInterfaceDestroy(
     remote_error *rerr,
     remote_interface_destroy_args *args,
     void *ret);
-static int remoteDispatchInterfaceGetXmlDesc(
+static int remoteDispatchInterfaceGetXMLDesc(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -922,7 +922,7 @@ static int remoteDispatchListNetworks(
     remote_error *rerr,
     remote_list_networks_args *args,
     remote_list_networks_ret *ret);
-static int remoteDispatchListNwfilters(
+static int remoteDispatchListNWFilters(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -954,7 +954,7 @@ static int remoteDispatchNetworkCreate(
     remote_error *rerr,
     remote_network_create_args *args,
     void *ret);
-static int remoteDispatchNetworkCreateXml(
+static int remoteDispatchNetworkCreateXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -962,7 +962,7 @@ static int remoteDispatchNetworkCreateXml(
     remote_error *rerr,
     remote_network_create_xml_args *args,
     remote_network_create_xml_ret *ret);
-static int remoteDispatchNetworkDefineXml(
+static int remoteDispatchNetworkDefineXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -978,7 +978,7 @@ static int remoteDispatchNetworkDestroy(
     remote_error *rerr,
     remote_network_destroy_args *args,
     void *ret);
-static int remoteDispatchNetworkDumpXml(
+static int remoteDispatchNetworkDumpXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1026,7 +1026,7 @@ static int remoteDispatchNetworkLookupByName(
     remote_error *rerr,
     remote_network_lookup_by_name_args *args,
     remote_network_lookup_by_name_ret *ret);
-static int remoteDispatchNetworkLookupByUuid(
+static int remoteDispatchNetworkLookupByUUID(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1050,7 +1050,7 @@ static int remoteDispatchNetworkUndefine(
     remote_error *rerr,
     remote_network_undefine_args *args,
     void *ret);
-static int remoteDispatchNodeDeviceCreateXml(
+static int remoteDispatchNodeDeviceCreateXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1074,7 +1074,7 @@ static int remoteDispatchNodeDeviceDettach(
     remote_error *rerr,
     remote_node_device_dettach_args *args,
     void *ret);
-static int remoteDispatchNodeDeviceDumpXml(
+static int remoteDispatchNodeDeviceDumpXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1234,7 +1234,7 @@ static int remoteDispatchNumOfNetworks(
     remote_error *rerr,
     void *args,
     remote_num_of_networks_ret *ret);
-static int remoteDispatchNumOfNwfilters(
+static int remoteDispatchNumOfNWFilters(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1258,7 +1258,7 @@ static int remoteDispatchNumOfStoragePools(
     remote_error *rerr,
     void *args,
     remote_num_of_storage_pools_ret *ret);
-static int remoteDispatchNWFilterDefineXml(
+static int remoteDispatchNWFilterDefineXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1266,7 +1266,7 @@ static int remoteDispatchNWFilterDefineXml(
     remote_error *rerr,
     remote_nwfilter_define_xml_args *args,
     remote_nwfilter_define_xml_ret *ret);
-static int remoteDispatchNWFilterGetXmlDesc(
+static int remoteDispatchNWFilterGetXMLDesc(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1282,7 +1282,7 @@ static int remoteDispatchNWFilterLookupByName(
     remote_error *rerr,
     remote_nwfilter_lookup_by_name_args *args,
     remote_nwfilter_lookup_by_name_ret *ret);
-static int remoteDispatchNWFilterLookupByUuid(
+static int remoteDispatchNWFilterLookupByUUID(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1306,7 +1306,7 @@ static int remoteDispatchOpen(
     remote_error *rerr,
     remote_open_args *args,
     void *ret);
-static int remoteDispatchSecretDefineXml(
+static int remoteDispatchSecretDefineXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1322,7 +1322,7 @@ static int remoteDispatchSecretGetValue(
     remote_error *rerr,
     remote_secret_get_value_args *args,
     remote_secret_get_value_ret *ret);
-static int remoteDispatchSecretGetXmlDesc(
+static int remoteDispatchSecretGetXMLDesc(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1338,7 +1338,7 @@ static int remoteDispatchSecretLookupByUsage(
     remote_error *rerr,
     remote_secret_lookup_by_usage_args *args,
     remote_secret_lookup_by_usage_ret *ret);
-static int remoteDispatchSecretLookupByUuid(
+static int remoteDispatchSecretLookupByUUID(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1378,7 +1378,7 @@ static int remoteDispatchStoragePoolCreate(
     remote_error *rerr,
     remote_storage_pool_create_args *args,
     void *ret);
-static int remoteDispatchStoragePoolCreateXml(
+static int remoteDispatchStoragePoolCreateXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1386,7 +1386,7 @@ static int remoteDispatchStoragePoolCreateXml(
     remote_error *rerr,
     remote_storage_pool_create_xml_args *args,
     remote_storage_pool_create_xml_ret *ret);
-static int remoteDispatchStoragePoolDefineXml(
+static int remoteDispatchStoragePoolDefineXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1410,7 +1410,7 @@ static int remoteDispatchStoragePoolDestroy(
     remote_error *rerr,
     remote_storage_pool_destroy_args *args,
     void *ret);
-static int remoteDispatchStoragePoolDumpXml(
+static int remoteDispatchStoragePoolDumpXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1466,7 +1466,7 @@ static int remoteDispatchStoragePoolLookupByName(
     remote_error *rerr,
     remote_storage_pool_lookup_by_name_args *args,
     remote_storage_pool_lookup_by_name_ret *ret);
-static int remoteDispatchStoragePoolLookupByUuid(
+static int remoteDispatchStoragePoolLookupByUUID(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1514,7 +1514,7 @@ static int remoteDispatchStoragePoolUndefine(
     remote_error *rerr,
     remote_storage_pool_undefine_args *args,
     void *ret);
-static int remoteDispatchStorageVolCreateXml(
+static int remoteDispatchStorageVolCreateXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1522,7 +1522,7 @@ static int remoteDispatchStorageVolCreateXml(
     remote_error *rerr,
     remote_storage_vol_create_xml_args *args,
     remote_storage_vol_create_xml_ret *ret);
-static int remoteDispatchStorageVolCreateXmlFrom(
+static int remoteDispatchStorageVolCreateXMLFrom(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
@@ -1546,7 +1546,7 @@ static int remoteDispatchStorageVolDownload(
     remote_error *rerr,
     remote_storage_vol_download_args *args,
     void *ret);
-static int remoteDispatchStorageVolDumpXml(
+static int remoteDispatchStorageVolDumpXML(
     struct qemud_server *server,
     struct qemud_client *client,
     virConnectPtr conn,
diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
index d711abc..627331e 100644
--- a/daemon/remote_dispatch_table.h
+++ b/daemon/remote_dispatch_table.h
@@ -52,13 +52,13 @@
     .args_filter = (xdrproc_t) xdr_remote_domain_create_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* DomainCreateXml => 10 */
-    .fn = (dispatch_fn) remoteDispatchDomainCreateXml,
+{   /* DomainCreateXML => 10 */
+    .fn = (dispatch_fn) remoteDispatchDomainCreateXML,
     .args_filter = (xdrproc_t) xdr_remote_domain_create_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_create_xml_ret,
 },
-{   /* DomainDefineXml => 11 */
-    .fn = (dispatch_fn) remoteDispatchDomainDefineXml,
+{   /* DomainDefineXML => 11 */
+    .fn = (dispatch_fn) remoteDispatchDomainDefineXML,
     .args_filter = (xdrproc_t) xdr_remote_domain_define_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_define_xml_ret,
 },
@@ -72,8 +72,8 @@
     .args_filter = (xdrproc_t) xdr_remote_domain_detach_device_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* DomainDumpXml => 14 */
-    .fn = (dispatch_fn) remoteDispatchDomainDumpXml,
+{   /* DomainDumpXML => 14 */
+    .fn = (dispatch_fn) remoteDispatchDomainDumpXML,
     .args_filter = (xdrproc_t) xdr_remote_domain_dump_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_dump_xml_ret,
 },
@@ -122,8 +122,8 @@
     .args_filter = (xdrproc_t) xdr_remote_domain_lookup_by_name_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_lookup_by_name_ret,
 },
-{   /* DomainLookupByUuid => 24 */
-    .fn = (dispatch_fn) remoteDispatchDomainLookupByUuid,
+{   /* DomainLookupByUUID => 24 */
+    .fn = (dispatch_fn) remoteDispatchDomainLookupByUUID,
     .args_filter = (xdrproc_t) xdr_remote_domain_lookup_by_uuid_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_lookup_by_uuid_ret,
 },
@@ -202,13 +202,13 @@
     .args_filter = (xdrproc_t) xdr_remote_network_create_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* NetworkCreateXml => 40 */
-    .fn = (dispatch_fn) remoteDispatchNetworkCreateXml,
+{   /* NetworkCreateXML => 40 */
+    .fn = (dispatch_fn) remoteDispatchNetworkCreateXML,
     .args_filter = (xdrproc_t) xdr_remote_network_create_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_network_create_xml_ret,
 },
-{   /* NetworkDefineXml => 41 */
-    .fn = (dispatch_fn) remoteDispatchNetworkDefineXml,
+{   /* NetworkDefineXML => 41 */
+    .fn = (dispatch_fn) remoteDispatchNetworkDefineXML,
     .args_filter = (xdrproc_t) xdr_remote_network_define_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_network_define_xml_ret,
 },
@@ -217,8 +217,8 @@
     .args_filter = (xdrproc_t) xdr_remote_network_destroy_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* NetworkDumpXml => 43 */
-    .fn = (dispatch_fn) remoteDispatchNetworkDumpXml,
+{   /* NetworkDumpXML => 43 */
+    .fn = (dispatch_fn) remoteDispatchNetworkDumpXML,
     .args_filter = (xdrproc_t) xdr_remote_network_dump_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_network_dump_xml_ret,
 },
@@ -237,8 +237,8 @@
     .args_filter = (xdrproc_t) xdr_remote_network_lookup_by_name_args,
     .ret_filter = (xdrproc_t) xdr_remote_network_lookup_by_name_ret,
 },
-{   /* NetworkLookupByUuid => 47 */
-    .fn = (dispatch_fn) remoteDispatchNetworkLookupByUuid,
+{   /* NetworkLookupByUUID => 47 */
+    .fn = (dispatch_fn) remoteDispatchNetworkLookupByUUID,
     .args_filter = (xdrproc_t) xdr_remote_network_lookup_by_uuid_args,
     .ret_filter = (xdrproc_t) xdr_remote_network_lookup_by_uuid_ret,
 },
@@ -382,13 +382,13 @@
     .args_filter = (xdrproc_t) xdr_remote_find_storage_pool_sources_args,
     .ret_filter = (xdrproc_t) xdr_remote_find_storage_pool_sources_ret,
 },
-{   /* StoragePoolCreateXml => 76 */
-    .fn = (dispatch_fn) remoteDispatchStoragePoolCreateXml,
+{   /* StoragePoolCreateXML => 76 */
+    .fn = (dispatch_fn) remoteDispatchStoragePoolCreateXML,
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_create_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_create_xml_ret,
 },
-{   /* StoragePoolDefineXml => 77 */
-    .fn = (dispatch_fn) remoteDispatchStoragePoolDefineXml,
+{   /* StoragePoolDefineXML => 77 */
+    .fn = (dispatch_fn) remoteDispatchStoragePoolDefineXML,
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_define_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_define_xml_ret,
 },
@@ -427,8 +427,8 @@
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_name_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_name_ret,
 },
-{   /* StoragePoolLookupByUuid => 85 */
-    .fn = (dispatch_fn) remoteDispatchStoragePoolLookupByUuid,
+{   /* StoragePoolLookupByUUID => 85 */
+    .fn = (dispatch_fn) remoteDispatchStoragePoolLookupByUUID,
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_uuid_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_uuid_ret,
 },
@@ -442,8 +442,8 @@
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_get_info_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_get_info_ret,
 },
-{   /* StoragePoolDumpXml => 88 */
-    .fn = (dispatch_fn) remoteDispatchStoragePoolDumpXml,
+{   /* StoragePoolDumpXML => 88 */
+    .fn = (dispatch_fn) remoteDispatchStoragePoolDumpXML,
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_dump_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_dump_xml_ret,
 },
@@ -467,8 +467,8 @@
     .args_filter = (xdrproc_t) xdr_remote_storage_pool_list_volumes_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_pool_list_volumes_ret,
 },
-{   /* StorageVolCreateXml => 93 */
-    .fn = (dispatch_fn) remoteDispatchStorageVolCreateXml,
+{   /* StorageVolCreateXML => 93 */
+    .fn = (dispatch_fn) remoteDispatchStorageVolCreateXML,
     .args_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_ret,
 },
@@ -497,8 +497,8 @@
     .args_filter = (xdrproc_t) xdr_remote_storage_vol_get_info_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_vol_get_info_ret,
 },
-{   /* StorageVolDumpXml => 99 */
-    .fn = (dispatch_fn) remoteDispatchStorageVolDumpXml,
+{   /* StorageVolDumpXML => 99 */
+    .fn = (dispatch_fn) remoteDispatchStorageVolDumpXML,
     .args_filter = (xdrproc_t) xdr_remote_storage_vol_dump_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_storage_vol_dump_xml_ret,
 },
@@ -552,8 +552,8 @@
     .args_filter = (xdrproc_t) xdr_remote_domain_migrate_finish2_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_migrate_finish2_ret,
 },
-{   /* GetUri => 110 */
-    .fn = (dispatch_fn) remoteDispatchGetUri,
+{   /* GetURI => 110 */
+    .fn = (dispatch_fn) remoteDispatchGetURI,
     .args_filter = (xdrproc_t) xdr_void,
     .ret_filter = (xdrproc_t) xdr_remote_get_uri_ret,
 },
@@ -572,8 +572,8 @@
     .args_filter = (xdrproc_t) xdr_remote_node_device_lookup_by_name_args,
     .ret_filter = (xdrproc_t) xdr_remote_node_device_lookup_by_name_ret,
 },
-{   /* NodeDeviceDumpXml => 114 */
-    .fn = (dispatch_fn) remoteDispatchNodeDeviceDumpXml,
+{   /* NodeDeviceDumpXML => 114 */
+    .fn = (dispatch_fn) remoteDispatchNodeDeviceDumpXML,
     .args_filter = (xdrproc_t) xdr_remote_node_device_dump_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_node_device_dump_xml_ret,
 },
@@ -617,8 +617,8 @@
     .args_filter = (xdrproc_t) xdr_void,
     .ret_filter = (xdrproc_t) xdr_remote_node_get_security_model_ret,
 },
-{   /* NodeDeviceCreateXml => 123 */
-    .fn = (dispatch_fn) remoteDispatchNodeDeviceCreateXml,
+{   /* NodeDeviceCreateXML => 123 */
+    .fn = (dispatch_fn) remoteDispatchNodeDeviceCreateXML,
     .args_filter = (xdrproc_t) xdr_remote_node_device_create_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_node_device_create_xml_ret,
 },
@@ -627,8 +627,8 @@
     .args_filter = (xdrproc_t) xdr_remote_node_device_destroy_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* StorageVolCreateXmlFrom => 125 */
-    .fn = (dispatch_fn) remoteDispatchStorageVolCreateXmlFrom,
+{   /* 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,
 },
@@ -652,13 +652,13 @@
     .args_filter = (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_args,
     .ret_filter = (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_ret,
 },
-{   /* InterfaceGetXmlDesc => 130 */
-    .fn = (dispatch_fn) remoteDispatchInterfaceGetXmlDesc,
+{   /* InterfaceGetXMLDesc => 130 */
+    .fn = (dispatch_fn) remoteDispatchInterfaceGetXMLDesc,
     .args_filter = (xdrproc_t) xdr_remote_interface_get_xml_desc_args,
     .ret_filter = (xdrproc_t) xdr_remote_interface_get_xml_desc_ret,
 },
-{   /* InterfaceDefineXml => 131 */
-    .fn = (dispatch_fn) remoteDispatchInterfaceDefineXml,
+{   /* InterfaceDefineXML => 131 */
+    .fn = (dispatch_fn) remoteDispatchInterfaceDefineXML,
     .args_filter = (xdrproc_t) xdr_remote_interface_define_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_interface_define_xml_ret,
 },
@@ -677,13 +677,13 @@
     .args_filter = (xdrproc_t) xdr_remote_interface_destroy_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* DomainXmlFromNative => 135 */
-    .fn = (dispatch_fn) remoteDispatchDomainXmlFromNative,
+{   /* DomainXMLFromNative => 135 */
+    .fn = (dispatch_fn) remoteDispatchDomainXMLFromNative,
     .args_filter = (xdrproc_t) xdr_remote_domain_xml_from_native_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_xml_from_native_ret,
 },
-{   /* DomainXmlToNative => 136 */
-    .fn = (dispatch_fn) remoteDispatchDomainXmlToNative,
+{   /* DomainXMLToNative => 136 */
+    .fn = (dispatch_fn) remoteDispatchDomainXMLToNative,
     .args_filter = (xdrproc_t) xdr_remote_domain_xml_to_native_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_xml_to_native_ret,
 },
@@ -707,18 +707,18 @@
     .args_filter = (xdrproc_t) xdr_remote_list_secrets_args,
     .ret_filter = (xdrproc_t) xdr_remote_list_secrets_ret,
 },
-{   /* SecretLookupByUuid => 141 */
-    .fn = (dispatch_fn) remoteDispatchSecretLookupByUuid,
+{   /* SecretLookupByUUID => 141 */
+    .fn = (dispatch_fn) remoteDispatchSecretLookupByUUID,
     .args_filter = (xdrproc_t) xdr_remote_secret_lookup_by_uuid_args,
     .ret_filter = (xdrproc_t) xdr_remote_secret_lookup_by_uuid_ret,
 },
-{   /* SecretDefineXml => 142 */
-    .fn = (dispatch_fn) remoteDispatchSecretDefineXml,
+{   /* SecretDefineXML => 142 */
+    .fn = (dispatch_fn) remoteDispatchSecretDefineXML,
     .args_filter = (xdrproc_t) xdr_remote_secret_define_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_secret_define_xml_ret,
 },
-{   /* SecretGetXmlDesc => 143 */
-    .fn = (dispatch_fn) remoteDispatchSecretGetXmlDesc,
+{   /* SecretGetXMLDesc => 143 */
+    .fn = (dispatch_fn) remoteDispatchSecretGetXMLDesc,
     .args_filter = (xdrproc_t) xdr_remote_secret_get_xml_desc_args,
     .ret_filter = (xdrproc_t) xdr_remote_secret_get_xml_desc_ret,
 },
@@ -882,28 +882,28 @@
     .args_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_name_args,
     .ret_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_name_ret,
 },
-{   /* NWFilterLookupByUuid => 176 */
-    .fn = (dispatch_fn) remoteDispatchNWFilterLookupByUuid,
+{   /* NWFilterLookupByUUID => 176 */
+    .fn = (dispatch_fn) remoteDispatchNWFilterLookupByUUID,
     .args_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_uuid_args,
     .ret_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_uuid_ret,
 },
-{   /* NWFilterGetXmlDesc => 177 */
-    .fn = (dispatch_fn) remoteDispatchNWFilterGetXmlDesc,
+{   /* NWFilterGetXMLDesc => 177 */
+    .fn = (dispatch_fn) remoteDispatchNWFilterGetXMLDesc,
     .args_filter = (xdrproc_t) xdr_remote_nwfilter_get_xml_desc_args,
     .ret_filter = (xdrproc_t) xdr_remote_nwfilter_get_xml_desc_ret,
 },
-{   /* NumOfNwfilters => 178 */
-    .fn = (dispatch_fn) remoteDispatchNumOfNwfilters,
+{   /* NumOfNWFilters => 178 */
+    .fn = (dispatch_fn) remoteDispatchNumOfNWFilters,
     .args_filter = (xdrproc_t) xdr_void,
     .ret_filter = (xdrproc_t) xdr_remote_num_of_nwfilters_ret,
 },
-{   /* ListNwfilters => 179 */
-    .fn = (dispatch_fn) remoteDispatchListNwfilters,
+{   /* ListNWFilters => 179 */
+    .fn = (dispatch_fn) remoteDispatchListNWFilters,
     .args_filter = (xdrproc_t) xdr_remote_list_nwfilters_args,
     .ret_filter = (xdrproc_t) xdr_remote_list_nwfilters_ret,
 },
-{   /* NWFilterDefineXml => 180 */
-    .fn = (dispatch_fn) remoteDispatchNWFilterDefineXml,
+{   /* NWFilterDefineXML => 180 */
+    .fn = (dispatch_fn) remoteDispatchNWFilterDefineXML,
     .args_filter = (xdrproc_t) xdr_remote_nwfilter_define_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_nwfilter_define_xml_ret,
 },
@@ -927,13 +927,13 @@
     .args_filter = (xdrproc_t) xdr_remote_domain_managed_save_remove_args,
     .ret_filter = (xdrproc_t) xdr_void,
 },
-{   /* DomainSnapshotCreateXml => 185 */
-    .fn = (dispatch_fn) remoteDispatchDomainSnapshotCreateXml,
+{   /* DomainSnapshotCreateXML => 185 */
+    .fn = (dispatch_fn) remoteDispatchDomainSnapshotCreateXML,
     .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_create_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_create_xml_ret,
 },
-{   /* DomainSnapshotDumpXml => 186 */
-    .fn = (dispatch_fn) remoteDispatchDomainSnapshotDumpXml,
+{   /* DomainSnapshotDumpXML => 186 */
+    .fn = (dispatch_fn) remoteDispatchDomainSnapshotDumpXML,
     .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_dump_xml_args,
     .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_dump_xml_ret,
 },
diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index 8ad6d0d..31af8b6 100755
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -32,7 +32,8 @@ sub name_to_ProcName {
     my $name = shift;
     my @elems = split /_/, $name;
     @elems = map ucfirst, @elems;
-    @elems = map { $_ eq "Nwfilter" ? "NWFilter" : $_ } @elems;
+    @elems = map { $_ =~ s/Nwfilter/NWFilter/; $_ =~ s/Xml/XML/;
+                   $_ =~ s/Uri/URI/; $_ =~ s/Uuid/UUID/; $_ } @elems;
     join "", @elems
 }
 
-- 
1.7.0.4


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