[libvirt] [PATCH 1/4] 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/ --- src/driver.h | 22 +++++++++++----------- src/esx/esx_driver.c | 2 +- src/interface/netcf_driver.c | 2 +- src/libvirt.c | 4 ++-- src/libxl/libxl_driver.c | 14 +++++++------- src/lxc/lxc_driver.c | 6 +++--- src/openvz/openvz_driver.c | 6 +++--- src/phyp/phyp_driver.c | 4 ++-- src/qemu/qemu_driver.c | 4 ++-- src/remote/remote_driver.c | 4 ++-- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/vmware/vmware_driver.c | 14 +++++++------- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 8 ++++---- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/driver.h b/src/driver.h index b800f35..cde2953 100644 --- a/src/driver.h +++ b/src/driver.h @@ -427,11 +427,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); @@ -511,7 +511,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 @@ -612,7 +612,7 @@ struct _virDriver { virDrvDomainMemoryPeek domainMemoryPeek; virDrvDomainGetBlockInfo domainGetBlockInfo; virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; - virDrvNodeGetFreeMemory getFreeMemory; + virDrvNodeGetFreeMemory nodeGetFreeMemory; virDrvDomainEventRegister domainEventRegister; virDrvDomainEventDeregister domainEventDeregister; virDrvDomainMigratePrepare2 domainMigratePrepare2; @@ -626,8 +626,8 @@ struct _virDriver { virDrvDomainIsActive domainIsActive; virDrvDomainIsPersistent domainIsPersistent; virDrvDomainIsUpdated domainIsUpdated; - virDrvCPUCompare cpuCompare; - virDrvCPUBaseline cpuBaseline; + virDrvCompareCPU cpuCompare; + virDrvBaselineCPU cpuBaseline; virDrvDomainGetJobInfo domainGetJobInfo; virDrvDomainAbortJob domainAbortJob; virDrvDomainMigrateSetMaxDowntime domainMigrateSetMaxDowntime; @@ -646,7 +646,7 @@ struct _virDriver { virDrvDomainSnapshotCurrent domainSnapshotCurrent; virDrvDomainRevertToSnapshot domainRevertToSnapshot; virDrvDomainSnapshotDelete domainSnapshotDelete; - virDrvQemuDomainMonitorCommand qemuDomainMonitorCommand; + virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainInjectNMI domainInjectNMI; }; @@ -1103,9 +1103,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); @@ -1127,8 +1127,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 ef7838a..e136716 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4597,7 +4597,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 709f09b..cf0efb7 100644 --- 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 6325188..6267fb2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4351,9 +4351,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 7e2e7c0..62a1e94 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2726,8 +2726,8 @@ static virDriver libxlDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ libxlDomainGetXMLDesc, /* domainGetXMLDesc */ - libxlDomainXMLFromNative, /* domainXmlFromNative */ - libxlDomainXMLToNative, /* domainXmlToNative */ + libxlDomainXMLFromNative, /* domainXMLFromNative */ + libxlDomainXMLToNative, /* domainXMLToNative */ libxlListDefinedDomains, /* listDefinedDomains */ libxlNumDefinedDomains, /* numOfDefinedDomains */ libxlDomainCreate, /* domainCreate */ @@ -2754,7 +2754,7 @@ static virDriver libxlDriver = { NULL, /* domainMemoryPeek */ NULL, /* domainGetBlockInfo */ NULL, /* nodeGetCellsFreeMemory */ - libxlNodeGetFreeMemory, /* getFreeMemory */ + libxlNodeGetFreeMemory, /* nodeGetFreeMemory */ libxlDomainEventRegister, /* domainEventRegister */ libxlDomainEventDeregister, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ @@ -2763,10 +2763,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 0939a1d..7e754ee 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2706,8 +2706,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 */ @@ -2781,7 +2781,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 fbb8800..b3edb3b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1604,8 +1604,8 @@ static virDriver openvzDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ openvzDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ openvzListDefinedDomains, /* listDefinedDomains */ openvzNumDefinedDomains, /* numOfDefinedDomains */ openvzDomainCreate, /* domainCreate */ @@ -1632,7 +1632,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 cc9ace3..af34297 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3793,7 +3793,7 @@ static virDriver phypDriver = { NULL, /* domainMemoryPeek */ NULL, /* domainGetBlockInfo */ NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ + NULL, /* nodeGetFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ @@ -3827,7 +3827,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 caae949..b2aa8d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7269,7 +7269,7 @@ static virDriver qemuDriver = { qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */ qemudNodeGetSecurityModel, /* nodeGetSecurityModel */ qemuDomainGetXMLDesc, /* domainGetXMLDesc */ - qemuDomainXMLFromNative, /* domainXmlFromNative */ + qemuDomainXMLFromNative, /* domainXMLFromNative */ qemuDomainXMLToNative, /* domainXMLToNative */ qemudListDefinedDomains, /* listDefinedDomains */ qemudNumDefinedDomains, /* numOfDefinedDomains */ @@ -7297,7 +7297,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 7ba2770..5c6b0d8 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6503,7 +6503,7 @@ static virDriver remote_driver = { remoteDomainMemoryPeek, /* domainMemoryPeek */ remoteDomainGetBlockInfo, /* domainGetBlockInfo */ remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - remoteNodeGetFreeMemory, /* getFreeMemory */ + remoteNodeGetFreeMemory, /* nodeGetFreeMemory */ remoteDomainEventRegister, /* domainEventRegister */ remoteDomainEventDeregister, /* domainEventDeregister */ remoteDomainMigratePrepare2, /* domainMigratePrepare2 */ @@ -6520,7 +6520,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 0f0d77b..3b5efa6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5412,7 +5412,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 e7cd77a..50eca53 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2219,7 +2219,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 b920f79..c1a21c4 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -944,8 +944,8 @@ static virDriver vmwareDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ vmwareDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ vmwareListDefinedDomains, /* listDefinedDomains */ vmwareNumDefinedDomains, /* numOfDefinedDomains */ vmwareDomainCreate, /* domainCreate */ @@ -972,7 +972,7 @@ static virDriver vmwareDriver = { NULL, /* domainMemoryPeek */ NULL, /* domainGetBlockInfo */ NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ + NULL, /* nodeGetFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ @@ -981,10 +981,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 5bafb73..ca4c498 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2174,7 +2174,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 136356d..0a1f7de 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1786,7 +1786,7 @@ static virDriver xenapiDriver = { xenapiSupportsFeature, /* supports_feature */ xenapiType, /* type */ xenapiGetVersion, /* version */ - NULL, /*getlibvirtVersion */ + NULL, /* libvirtVersion */ xenapiGetHostname, /* getHostname */ NULL, /* getSysinfo */ xenapiGetMaxVcpus, /* getMaxVcpus */ @@ -1826,8 +1826,8 @@ static virDriver xenapiDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ xenapiDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ xenapiListDefinedDomains, /* listDefinedDomains */ xenapiNumOfDefinedDomains, /* numOfDefinedDomains */ xenapiDomainCreate, /* domainCreate */ @@ -1854,7 +1854,7 @@ static virDriver xenapiDriver = { NULL, /* domainMemoryPeek */ NULL, /* domainGetBlockInfo */ xenapiNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - xenapiNodeGetFreeMemory, /* getFreeMemory */ + xenapiNodeGetFreeMemory, /* nodeGetFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ -- 1.7.4.4