Tweak driver naming for consistency with public API

Fix some driver names:

  s/virDrvCPUCompare/virDrvCompareCPU/
  s/virDrvCPUBaseline/virDrvBaselineCPU/
  s/virDrvQemuDomainMonitorCommand/virDrvDomainQemuMonitorCommand/
  s/virDrvSecretNumOfSecrets/virDrvNumOfSecrets/
  s/virDrvSecretListSecrets/virDrvListSecrets/

And some driver struct field names:

  s/getFreeMemory/nodeGetFreeMemory/

diff --git a/src/driver.h b/src/driver.h
index ed99445ce6251883915b25522f659d0d7ca83303..5f9ec55e696063d702ede7e9fa70fc52bfc58935 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -432,11 +432,11 @@ typedef int
     (*virDrvDomainIsUpdated)(virDomainPtr dom);
 
 typedef int
-    (*virDrvCPUCompare)(virConnectPtr conn,
+    (*virDrvCompareCPU)(virConnectPtr conn,
                         const char *cpu,
                         unsigned int flags);
 typedef char *
-    (*virDrvCPUBaseline)(virConnectPtr conn,
+    (*virDrvBaselineCPU)(virConnectPtr conn,
                          const char **xmlCPUs,
                          unsigned int ncpus,
                          unsigned int flags);
@@ -516,7 +516,7 @@ typedef int
                                   unsigned int flags);
 
 typedef int
-    (*virDrvQemuDomainMonitorCommand)(virDomainPtr domain, const char *cmd,
+    (*virDrvDomainQemuMonitorCommand)(virDomainPtr domain, const char *cmd,
                                       char **result, unsigned int flags);
 
 typedef int
@@ -618,7 +618,7 @@ struct _virDriver {
     virDrvDomainMemoryPeek      domainMemoryPeek;
     virDrvDomainGetBlockInfo    domainGetBlockInfo;
     virDrvNodeGetCellsFreeMemory       nodeGetCellsFreeMemory;
-    virDrvNodeGetFreeMemory            getFreeMemory;
+    virDrvNodeGetFreeMemory            nodeGetFreeMemory;
     virDrvDomainEventRegister         domainEventRegister;
     virDrvDomainEventDeregister       domainEventDeregister;
     virDrvDomainMigratePrepare2        domainMigratePrepare2;
@@ -632,8 +632,8 @@ struct _virDriver {
     virDrvDomainIsActive       domainIsActive;
     virDrvDomainIsPersistent   domainIsPersistent;
     virDrvDomainIsUpdated      domainIsUpdated;
-    virDrvCPUCompare            cpuCompare;
-    virDrvCPUBaseline           cpuBaseline;
+    virDrvCompareCPU            cpuCompare;
+    virDrvBaselineCPU           cpuBaseline;
     virDrvDomainGetJobInfo     domainGetJobInfo;
     virDrvDomainAbortJob     domainAbortJob;
     virDrvDomainMigrateSetMaxDowntime  domainMigrateSetMaxDowntime;
@@ -652,7 +652,7 @@ struct _virDriver {
     virDrvDomainSnapshotCurrent domainSnapshotCurrent;
     virDrvDomainRevertToSnapshot domainRevertToSnapshot;
     virDrvDomainSnapshotDelete domainSnapshotDelete;
-    virDrvQemuDomainMonitorCommand qemuDomainMonitorCommand;
+    virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand;
     virDrvDomainOpenConsole domainOpenConsole;
     virDrvDomainInjectNMI domainInjectNMI;
 };
@@ -1109,9 +1109,9 @@ typedef unsigned char *
 typedef int
     (*virDrvSecretUndefine)                  (virSecretPtr secret);
 typedef int
-    (*virDrvSecretNumOfSecrets)              (virConnectPtr conn);
+    (*virDrvNumOfSecrets)              (virConnectPtr conn);
 typedef int
-    (*virDrvSecretListSecrets)               (virConnectPtr conn,
+    (*virDrvListSecrets)               (virConnectPtr conn,
                                               char **uuids,
                                               int maxuuids);
 
@@ -1133,8 +1133,8 @@ struct _virSecretDriver {
     virDrvOpen open;
     virDrvClose close;
 
-    virDrvSecretNumOfSecrets numOfSecrets;
-    virDrvSecretListSecrets listSecrets;
+    virDrvNumOfSecrets numOfSecrets;
+    virDrvListSecrets listSecrets;
     virDrvSecretLookupByUUID lookupByUUID;
     virDrvSecretLookupByUsage lookupByUsage;
     virDrvSecretDefineXML defineXML;

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index f994d3c9f70fd57bcc69c5edfce8eb8a879acae0..043722d833db570d066d5aedaf63002921d0889b 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -4640,7 +4640,7 @@ static virDriver esxDriver = {
     esxGetType,                      /* type */
     esxGetVersion,                   /* version */
     NULL,                            /* libvirtVersion (impl. in libvirt.c) */
-    esxGetHostname,                  /* hostname */
+    esxGetHostname,                  /* getHostname */
     NULL,                            /* getSysinfo */
     NULL,                            /* getMaxVcpus */
     esxNodeGetInfo,                  /* nodeGetInfo */

diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c
index 709f09b0dbfead9a50a66aea5944c63b5b410775..cf0efb75ef46434d422415ac65c8c403a1849a98 100644 (file)
--- a/src/interface/netcf_driver.c
+++ b/src/interface/netcf_driver.c
@@ -549,7 +549,7 @@ static virInterfaceDriver interfaceDriver = {
     interfaceNumOfDefinedInterfaces, /* numOfInterfaces */
     interfaceListDefinedInterfaces,  /* listInterfaces */
     interfaceLookupByName,           /* interfaceLookupByName */
-    interfaceLookupByMACString,      /* interfaceLookupByMACSTring */
+    interfaceLookupByMACString,      /* interfaceLookupByMACString */
     interfaceGetXMLDesc,             /* interfaceGetXMLDesc */
     interfaceDefineXML,              /* interfaceDefineXML */
     interfaceUndefine,               /* interfaceUndefine */

diff --git a/src/libvirt.c b/src/libvirt.c
index 22a9b564ca143afe95042b0fba192b59da109f18..afabcac83e1a3b682f17f0d0a3879b198b60e4fa 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -4402,9 +4402,9 @@ virNodeGetFreeMemory(virConnectPtr conn)
         return 0;
     }
 
-    if (conn->driver->getFreeMemory) {
+    if (conn->driver->nodeGetFreeMemory) {
         unsigned long long ret;
-        ret = conn->driver->getFreeMemory (conn);
+        ret = conn->driver->nodeGetFreeMemory (conn);
         if (ret == 0)
             goto error;
         return ret;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 1d7d1550b3eccad6c8e30dfc6aec7e61bee7919d..bbcc9af55538a98d21b6771450d67eb472ae7db0 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2736,8 +2736,8 @@ static virDriver libxlDriver = {
     NULL,                       /* domainGetSecurityLabel */
     NULL,                       /* nodeGetSecurityModel */
     libxlDomainGetXMLDesc,      /* domainGetXMLDesc */
-    libxlDomainXMLFromNative,   /* domainXmlFromNative */
-    libxlDomainXMLToNative,     /* domainXmlToNative */
+    libxlDomainXMLFromNative,   /* domainXMLFromNative */
+    libxlDomainXMLToNative,     /* domainXMLToNative */
     libxlListDefinedDomains,    /* listDefinedDomains */
     libxlNumDefinedDomains,     /* numOfDefinedDomains */
     libxlDomainCreate,          /* domainCreate */
@@ -2764,7 +2764,7 @@ static virDriver libxlDriver = {
     NULL,                       /* domainMemoryPeek */
     NULL,                       /* domainGetBlockInfo */
     NULL,                       /* nodeGetCellsFreeMemory */
-    libxlNodeGetFreeMemory,     /* getFreeMemory */
+    libxlNodeGetFreeMemory,     /* nodeGetFreeMemory */
     libxlDomainEventRegister,   /* domainEventRegister */
     libxlDomainEventDeregister, /* domainEventDeregister */
     NULL,                       /* domainMigratePrepare2 */
@@ -2773,10 +2773,10 @@ static virDriver libxlDriver = {
     NULL,                       /* nodeDeviceReAttach */
     NULL,                       /* nodeDeviceReset */
     NULL,                       /* domainMigratePrepareTunnel */
-    NULL,                       /* IsEncrypted */
-    NULL,                       /* IsSecure */
-    libxlDomainIsActive,        /* DomainIsActive */
-    libxlDomainIsPersistent,    /* DomainIsPersistent */
+    NULL,                       /* isEncrypted */
+    NULL,                       /* isSecure */
+    libxlDomainIsActive,        /* domainIsActive */
+    libxlDomainIsPersistent,    /* domainIsPersistent */
     libxlDomainIsUpdated,       /* domainIsUpdated */
     NULL,                       /* cpuCompare */
     NULL,                       /* cpuBaseline */

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 1c55aee5c4a751ee12f98d639470322e697d2273..2012eda68efcda45e40160609bc5ac39506c52ef 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2714,8 +2714,8 @@ cleanup:
 
 /* Function Tables */
 static virDriver lxcDriver = {
-    VIR_DRV_LXC, /* the number virDrvNo */
-    "LXC", /* the name of the driver */
+    VIR_DRV_LXC,
+    "LXC",
     lxcOpen, /* open */
     lxcClose, /* close */
     NULL, /* supports_feature */
@@ -2790,7 +2790,7 @@ static virDriver lxcDriver = {
     NULL, /* domainMemoryPeek */
     NULL, /* domainGetBlockInfo */
     nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    nodeGetFreeMemory,  /* getFreeMemory */
+    nodeGetFreeMemory,  /* nodeGetFreeMemory */
     lxcDomainEventRegister, /* domainEventRegister */
     lxcDomainEventDeregister, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 897211b37162d07b0ad7e8f80afe5d8e955f7b9d..fbffbfd26067401384865148893f7c150e47a1a2 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1625,8 +1625,8 @@ static virDriver openvzDriver = {
     NULL, /* domainGetSecurityLabel */
     NULL, /* nodeGetSecurityModel */
     openvzDomainGetXMLDesc, /* domainGetXMLDesc */
-    NULL, /* domainXmlFromNative */
-    NULL, /* domainXmlToNative */
+    NULL, /* domainXMLFromNative */
+    NULL, /* domainXMLToNative */
     openvzListDefinedDomains, /* listDefinedDomains */
     openvzNumDefinedDomains, /* numOfDefinedDomains */
     openvzDomainCreate, /* domainCreate */
@@ -1653,7 +1653,7 @@ static virDriver openvzDriver = {
     NULL, /* domainMemoryPeek */
     NULL, /* domainGetBlockInfo */
     NULL, /* nodeGetCellsFreeMemory */
-    NULL, /* getFreeMemory */
+    NULL, /* nodeGetFreeMemory */
     NULL, /* domainEventRegister */
     NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 8383e3827ba86f5eb0109a1ed282ef1f863187cc..c909c6d63a55fe59ebba64b91ebc96ef10571ded 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -3814,7 +3814,7 @@ static virDriver phypDriver = {
     NULL,                       /* domainMemoryPeek */
     NULL,                       /* domainGetBlockInfo */
     NULL,                       /* nodeGetCellsFreeMemory */
-    NULL,                       /* getFreeMemory */
+    NULL,                       /* nodeGetFreeMemory */
     NULL,                       /* domainEventRegister */
     NULL,                       /* domainEventDeregister */
     NULL,                       /* domainMigratePrepare2 */
@@ -3848,7 +3848,7 @@ static virDriver phypDriver = {
     NULL,                       /* domainSnapshotCurrent */
     NULL,                       /* domainRevertToSnapshot */
     NULL,                       /* domainSnapshotDelete */
-    NULL,                       /* qemuMonitorCommand */
+    NULL,                       /* qemuDomainMonitorCommand */
     NULL,                       /* domainOpenConsole */
     NULL,                       /* domainInjectNMI */
 };

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 27951f46f415c8768cae24055c03e14888d1e105..294aad31462af3331ad30ea99464c8347d796cee 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7302,7 +7302,7 @@ static virDriver qemuDriver = {
     qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */
     qemudNodeGetSecurityModel, /* nodeGetSecurityModel */
     qemuDomainGetXMLDesc, /* domainGetXMLDesc */
-    qemuDomainXMLFromNative, /* domainXmlFromNative */
+    qemuDomainXMLFromNative, /* domainXMLFromNative */
     qemuDomainXMLToNative, /* domainXMLToNative */
     qemudListDefinedDomains, /* listDefinedDomains */
     qemudNumDefinedDomains, /* numOfDefinedDomains */
@@ -7330,7 +7330,7 @@ static virDriver qemuDriver = {
     qemudDomainMemoryPeek, /* domainMemoryPeek */
     qemuDomainGetBlockInfo, /* domainGetBlockInfo */
     nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    nodeGetFreeMemory,  /* getFreeMemory */
+    nodeGetFreeMemory,  /* nodeGetFreeMemory */
     qemuDomainEventRegister, /* domainEventRegister */
     qemuDomainEventDeregister, /* domainEventDeregister */
     qemudDomainMigratePrepare2, /* domainMigratePrepare2 */

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index e5003b89534b4ef343b891c467c53b6c3ebdeb60..564eff6b8ac2bf5c163073f4d269956a6540cd23 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6473,7 +6473,7 @@ static virDriver remote_driver = {
     remoteDomainMemoryPeek, /* domainMemoryPeek */
     remoteDomainGetBlockInfo, /* domainGetBlockInfo */
     remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    remoteNodeGetFreeMemory, /* getFreeMemory */
+    remoteNodeGetFreeMemory, /* nodeGetFreeMemory */
     remoteDomainEventRegister, /* domainEventRegister */
     remoteDomainEventDeregister, /* domainEventDeregister */
     remoteDomainMigratePrepare2, /* domainMigratePrepare2 */
@@ -6490,7 +6490,7 @@ static virDriver remote_driver = {
     remoteCPUCompare, /* cpuCompare */
     remoteCPUBaseline, /* cpuBaseline */
     remoteDomainGetJobInfo, /* domainGetJobInfo */
-    remoteDomainAbortJob, /* domainFinishJob */
+    remoteDomainAbortJob, /* domainAbortJob */
     remoteDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */
     remoteDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */
     remoteDomainEventRegisterAny, /* domainEventRegisterAny */

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index a9c9846ce8a49b3c8ca3d0d220c4d3485eb2d5b4..6d0c9a74044c874e6b7dc5c93f9b411349d6d90c 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5394,7 +5394,7 @@ static virDriver testDriver = {
     NULL, /* domainMemoryPeek */
     NULL, /* domainGetBlockInfo */
     testNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    NULL, /* getFreeMemory */
+    NULL, /* nodeGetFreeMemory */
     testDomainEventRegister, /* domainEventRegister */
     testDomainEventDeregister, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 5a941fa2aabcbf488abde505eccf3d4d105a8cbd..bb1f1f8642e398ba906ef7e8092fcfd89e1d2c16 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -2257,7 +2257,7 @@ static virDriver umlDriver = {
     NULL, /* domainMemoryPeek */
     NULL, /* domainGetBlockInfo */
     nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    nodeGetFreeMemory,  /* getFreeMemory */
+    nodeGetFreeMemory,  /* nodeGetFreeMemory */
     NULL, /* domainEventRegister */
     NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index a086ca6647a41934299fa68f9b9c25fb201a495e..7eaea31876e47226149224710580ec0cffdee73b 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -978,8 +978,8 @@ static virDriver vmwareDriver = {
     NULL,                       /* domainGetSecurityLabel */
     NULL,                       /* nodeGetSecurityModel */
     vmwareDomainGetXMLDesc,     /* domainGetXMLDesc */
-    NULL,                       /* domainXmlFromNative */
-    NULL,                       /* domainXmlToNative */
+    NULL,                       /* domainXMLFromNative */
+    NULL,                       /* domainXMLToNative */
     vmwareListDefinedDomains,   /* listDefinedDomains */
     vmwareNumDefinedDomains,    /* numOfDefinedDomains */
     vmwareDomainCreate,         /* domainCreate */
@@ -1006,7 +1006,7 @@ static virDriver vmwareDriver = {
     NULL,                       /* domainMemoryPeek */
     NULL,                       /* domainGetBlockInfo */
     NULL,                       /* nodeGetCellsFreeMemory */
-    NULL,                       /* getFreeMemory */
+    NULL,                       /* nodeGetFreeMemory */
     NULL,                       /* domainEventRegister */
     NULL,                       /* domainEventDeregister */
     NULL,                       /* domainMigratePrepare2 */
@@ -1015,10 +1015,10 @@ static virDriver vmwareDriver = {
     NULL,                       /* nodeDeviceReAttach */
     NULL,                       /* nodeDeviceReset */
     NULL,                       /* domainMigratePrepareTunnel */
-    NULL,                       /* IsEncrypted */
-    NULL,                       /* IsSecure */
-    vmwareDomainIsActive,       /* DomainIsActive */
-    vmwareDomainIsPersistent,   /* DomainIsPersistent */
+    NULL,                       /* isEncrypted */
+    NULL,                       /* isSecure */
+    vmwareDomainIsActive,       /* domainIsActive */
+    vmwareDomainIsPersistent,   /* domainIsPersistent */
     NULL,                       /* domainIsUpdated */
     NULL,                       /* cpuCompare */
     NULL,                       /* cpuBaseline */

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 086edcafa533da20d481dfd74fecbb4dfd60b8ff..d51b1581f6dbe2b7ae424748d36ce308848f8b03 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2216,7 +2216,7 @@ static virDriver xenUnifiedDriver = {
     NULL, /* domainMemoryPeek */
     NULL, /* domainGetBlockInfo */
     xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    xenUnifiedNodeGetFreeMemory, /* getFreeMemory */
+    xenUnifiedNodeGetFreeMemory, /* nodeGetFreeMemory */
     xenUnifiedDomainEventRegister, /* domainEventRegister */
     xenUnifiedDomainEventDeregister, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 23bc5bf78b0529df33a436c3d59ea471ad1320ee..15fa4e89d7c30df385122427b75cd40e850da055 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1834,7 +1834,7 @@ static virDriver xenapiDriver = {
     xenapiSupportsFeature, /* supports_feature */
     xenapiType, /* type */
     xenapiGetVersion, /* version */
-    NULL, /*getlibvirtVersion */
+    NULL, /* libvirtVersion */
     xenapiGetHostname, /* getHostname */
     NULL, /* getSysinfo */
     xenapiGetMaxVcpus, /* getMaxVcpus */
@@ -1875,8 +1875,8 @@ static virDriver xenapiDriver = {
     NULL, /* domainGetSecurityLabel */
     NULL, /* nodeGetSecurityModel */
     xenapiDomainGetXMLDesc, /* domainGetXMLDesc */
-    NULL, /* domainXmlFromNative */
-    NULL, /* domainXmlToNative */
+    NULL, /* domainXMLFromNative */
+    NULL, /* domainXMLToNative */
     xenapiListDefinedDomains, /* listDefinedDomains */
     xenapiNumOfDefinedDomains, /* numOfDefinedDomains */
     xenapiDomainCreate, /* domainCreate */
@@ -1903,7 +1903,7 @@ static virDriver xenapiDriver = {
     NULL, /* domainMemoryPeek */
     NULL, /* domainGetBlockInfo */
     xenapiNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
-    xenapiNodeGetFreeMemory, /* getFreeMemory */
+    xenapiNodeGetFreeMemory, /* nodeGetFreeMemory */
     NULL, /* domainEventRegister */
     NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */