[libvirt] Allow hvsupport.html.in to be auto-generated
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file. To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
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
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
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/
ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
Change all the driver struct initializers to use the C99 style, leaving out unused fields. This will make it possible to add new APIs without changing every driver. eg change: qemudDomainResume, /* domainResume */ qemudDomainShutdown, /* domainShutdown */ NULL, /* domainReboot */ qemudDomainDestroy, /* domainDestroy */ to .domainResume = qemudDomainResume, .domainShutdown = qemudDomainShutdown, .domainDestroy = qemudDomainDestroy, And get rid of any existing C99 style initializersr which set NULL, eg change .listPools = vboxStorageListPools, .numOfDefinedPools = NULL, .listDefinedPools = NULL, .findPoolSources = NULL, .poolLookupByName = vboxStoragePoolLookupByName, to .listPools = vboxStorageListPools, .poolLookupByName = vboxStoragePoolLookupByName, --- src/esx/esx_driver.c | 171 +++++++++++------------------- src/esx/esx_interface_driver.c | 16 +--- src/esx/esx_network_driver.c | 21 +---- src/esx/esx_nwfilter_driver.c | 11 +-- src/esx/esx_secret_driver.c | 13 +-- src/esx/esx_storage_driver.c | 66 +++++------- src/interface/netcf_driver.c | 28 +++--- src/libxl/libxl_driver.c | 161 +++++++++------------------- src/lxc/lxc_driver.c | 157 ++++++++------------------- src/network/bridge_driver.c | 34 +++--- src/openvz/openvz_driver.c | 148 +++++++------------------- src/phyp/phyp_driver.c | 161 +++++----------------------- src/qemu/qemu_driver.c | 216 ++++++++++++++++++------------------- src/remote/remote_driver.c | 220 +++++++++++++++++++------------------- src/test/test_driver.c | 232 +++++++++++++++------------------------ src/uml/uml_driver.c | 152 +++++++------------------- src/vbox/vbox_tmpl.c | 202 +++++++++++------------------------ src/vmware/vmware_driver.c | 136 +++++------------------- src/xen/xen_driver.c | 184 +++++++++++++------------------- src/xenapi/xenapi_driver.c | 153 ++++++++------------------- 20 files changed, 841 insertions(+), 1641 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e136716..4c9bed2 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4591,116 +4591,67 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params, static virDriver esxDriver = { VIR_DRV_ESX, "ESX", - esxOpen, /* open */ - esxClose, /* close */ - esxSupportsFeature, /* supports_feature */ - esxGetType, /* type */ - esxGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - esxGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - esxNodeGetInfo, /* nodeGetInfo */ - esxGetCapabilities, /* getCapabilities */ - esxListDomains, /* listDomains */ - esxNumberOfDomains, /* numOfDomains */ - NULL, /* domainCreateXML */ - esxDomainLookupByID, /* domainLookupByID */ - esxDomainLookupByUUID, /* domainLookupByUUID */ - esxDomainLookupByName, /* domainLookupByName */ - esxDomainSuspend, /* domainSuspend */ - esxDomainResume, /* domainResume */ - esxDomainShutdown, /* domainShutdown */ - esxDomainReboot, /* domainReboot */ - esxDomainDestroy, /* domainDestroy */ - esxDomainGetOSType, /* domainGetOSType */ - esxDomainGetMaxMemory, /* domainGetMaxMemory */ - esxDomainSetMaxMemory, /* domainSetMaxMemory */ - esxDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - esxDomainSetMemoryParameters, /* domainSetMemoryParameters */ - esxDomainGetMemoryParameters, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - esxDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - esxDomainSetVcpus, /* domainSetVcpus */ - esxDomainSetVcpusFlags, /* domainSetVcpusFlags */ - esxDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - esxDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - esxDomainGetXMLDesc, /* domainGetXMLDesc */ - esxDomainXMLFromNative, /* domainXMLFromNative */ - esxDomainXMLToNative, /* domainXMLToNative */ - esxListDefinedDomains, /* listDefinedDomains */ - esxNumberOfDefinedDomains, /* numOfDefinedDomains */ - esxDomainCreate, /* domainCreate */ - esxDomainCreateWithFlags, /* domainCreateWithFlags */ - esxDomainDefineXML, /* domainDefineXML */ - esxDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - esxDomainGetAutostart, /* domainGetAutostart */ - esxDomainSetAutostart, /* domainSetAutostart */ - esxDomainGetSchedulerType, /* domainGetSchedulerType */ - esxDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ - esxDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ - esxDomainMigratePrepare, /* domainMigratePrepare */ - esxDomainMigratePerform, /* domainMigratePerform */ - esxDomainMigrateFinish, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - esxNodeGetFreeMemory, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - esxIsEncrypted, /* isEncrypted */ - esxIsSecure, /* isSecure */ - esxDomainIsActive, /* domainIsActive */ - esxDomainIsPersistent, /* domainIsPersistent */ - esxDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - esxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - esxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - esxDomainSnapshotNum, /* domainSnapshotNum */ - esxDomainSnapshotListNames, /* domainSnapshotListNames */ - esxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - esxDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - esxDomainSnapshotCurrent, /* domainSnapshotCurrent */ - esxDomainRevertToSnapshot, /* domainRevertToSnapshot */ - esxDomainSnapshotDelete, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = esxOpen, + .close = esxClose, + .supports_feature = esxSupportsFeature, + .type = esxGetType, + .version = esxGetVersion, + .getHostname = esxGetHostname, + .nodeGetInfo = esxNodeGetInfo, + .getCapabilities = esxGetCapabilities, + .listDomains = esxListDomains, + .numOfDomains = esxNumberOfDomains, + .domainLookupByID = esxDomainLookupByID, + .domainLookupByUUID = esxDomainLookupByUUID, + .domainLookupByName = esxDomainLookupByName, + .domainSuspend = esxDomainSuspend, + .domainResume = esxDomainResume, + .domainShutdown = esxDomainShutdown, + .domainReboot = esxDomainReboot, + .domainDestroy = esxDomainDestroy, + .domainGetOSType = esxDomainGetOSType, + .domainGetMaxMemory = esxDomainGetMaxMemory, + .domainSetMaxMemory = esxDomainSetMaxMemory, + .domainSetMemory = esxDomainSetMemory, + .domainSetMemoryParameters = esxDomainSetMemoryParameters, + .domainGetMemoryParameters = esxDomainGetMemoryParameters, + .domainGetInfo = esxDomainGetInfo, + .domainSetVcpus = esxDomainSetVcpus, + .domainSetVcpusFlags = esxDomainSetVcpusFlags, + .domainGetVcpusFlags = esxDomainGetVcpusFlags, + .domainGetMaxVcpus = esxDomainGetMaxVcpus, + .domainGetXMLDesc = esxDomainGetXMLDesc, + .domainXMLFromNative = esxDomainXMLFromNative, + .domainXMLToNative = esxDomainXMLToNative, + .listDefinedDomains = esxListDefinedDomains, + .numOfDefinedDomains = esxNumberOfDefinedDomains, + .domainCreate = esxDomainCreate, + .domainCreateWithFlags = esxDomainCreateWithFlags, + .domainDefineXML = esxDomainDefineXML, + .domainUndefine = esxDomainUndefine, + .domainGetAutostart = esxDomainGetAutostart, + .domainSetAutostart = esxDomainSetAutostart, + .domainGetSchedulerType = esxDomainGetSchedulerType, + .domainGetSchedulerParameters = esxDomainGetSchedulerParameters, + .domainSetSchedulerParameters = esxDomainSetSchedulerParameters, + .domainMigratePrepare = esxDomainMigratePrepare, + .domainMigratePerform = esxDomainMigratePerform, + .domainMigrateFinish = esxDomainMigrateFinish, + .nodeGetFreeMemory = esxNodeGetFreeMemory, + .isEncrypted = esxIsEncrypted, + .isSecure = esxIsSecure, + .domainIsActive = esxDomainIsActive, + .domainIsPersistent = esxDomainIsPersistent, + .domainIsUpdated = esxDomainIsUpdated, + .domainSnapshotCreateXML = esxDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = esxDomainSnapshotGetXMLDesc, + .domainSnapshotNum = esxDomainSnapshotNum, + .domainSnapshotListNames = esxDomainSnapshotListNames, + .domainSnapshotLookupByName = esxDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = esxDomainHasCurrentSnapshot, + .domainSnapshotCurrent = esxDomainSnapshotCurrent, + .domainRevertToSnapshot = esxDomainRevertToSnapshot, + .domainSnapshotDelete = esxDomainSnapshotDelete, }; diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 4bac3d5..ea60095 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -67,20 +67,8 @@ esxInterfaceClose(virConnectPtr conn) static virInterfaceDriver esxInterfaceDriver = { "ESX", /* name */ - esxInterfaceOpen, /* open */ - esxInterfaceClose, /* close */ - NULL, /* numOfInterfaces */ - NULL, /* listInterfaces */ - NULL, /* numOfDefinedInterfaces */ - NULL, /* listDefinedInterfaces */ - NULL, /* interfaceLookupByName */ - NULL, /* interfaceLookupByMACString */ - NULL, /* interfaceGetXMLDesc */ - NULL, /* interfaceDefineXML */ - NULL, /* interfaceUndefine */ - NULL, /* interfaceCreate */ - NULL, /* interfaceDestroy */ - NULL, /* interfaceIsActive */ + .open = esxInterfaceOpen, + .close = esxInterfaceClose, }; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index bbc2541..78079bb 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -67,25 +67,8 @@ esxNetworkClose(virConnectPtr conn) static virNetworkDriver esxNetworkDriver = { "ESX", /* name */ - esxNetworkOpen, /* open */ - esxNetworkClose, /* close */ - NULL, /* numOfNetworks */ - NULL, /* listNetworks */ - NULL, /* numOfDefinedNetworks */ - NULL, /* listDefinedNetworks */ - NULL, /* networkLookupByUUID */ - NULL, /* networkLookupByName */ - NULL, /* networkCreateXML */ - NULL, /* networkDefineXML */ - NULL, /* networkUndefine */ - NULL, /* networkCreate */ - NULL, /* networkDestroy */ - NULL, /* networkGetXMLDesc */ - NULL, /* networkGetBridgeName */ - NULL, /* networkGetAutostart */ - NULL, /* networkSetAutostart */ - NULL, /* networkIsActive */ - NULL, /* networkIsPersistent */ + .open = esxNetworkOpen, + .close = esxNetworkClose, }; diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index a9d046d..8811f47 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -66,15 +66,8 @@ esxNWFilterClose(virConnectPtr conn) static virNWFilterDriver esxNWFilterDriver = { "ESX", /* name */ - esxNWFilterOpen, /* open */ - esxNWFilterClose, /* close */ - NULL, /* numOfNWFilters */ - NULL, /* listNWFilters */ - NULL, /* nwfilterLookupByName */ - NULL, /* nwfilterLookupByUUID */ - NULL, /* defineXML */ - NULL, /* undefine */ - NULL, /* getXMLDesc */ + .open = esxNWFilterOpen, + .close = esxNWFilterClose, }; diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index 1ae7ddc..8c09191 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -65,17 +65,8 @@ esxSecretClose(virConnectPtr conn) static virSecretDriver esxSecretDriver = { "ESX", /* name */ - esxSecretOpen, /* open */ - esxSecretClose, /* close */ - NULL, /* numOfSecrets */ - NULL, /* listSecrets */ - NULL, /* lookupByUUID */ - NULL, /* lookupByUsage */ - NULL, /* defineXML */ - NULL, /* getXMLDesc */ - NULL, /* setValue */ - NULL, /* getValue */ - NULL, /* undefine */ + .open = esxSecretOpen, + .close = esxSecretClose, }; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index f37d064..0e86467 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1642,44 +1642,34 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static virStorageDriver esxStorageDriver = { "ESX", /* name */ - esxStorageOpen, /* open */ - esxStorageClose, /* close */ - esxNumberOfStoragePools, /* numOfPools */ - esxListStoragePools, /* listPools */ - esxNumberOfDefinedStoragePools, /* numOfDefinedPools */ - esxListDefinedStoragePools, /* listDefinedPools */ - NULL, /* findPoolSources */ - esxStoragePoolLookupByName, /* poolLookupByName */ - esxStoragePoolLookupByUUID, /* poolLookupByUUID */ - esxStoragePoolLookupByVolume, /* poolLookupByVolume */ - NULL, /* poolCreateXML */ - NULL, /* poolDefineXML */ - NULL, /* poolBuild */ - NULL, /* poolUndefine */ - NULL, /* poolCreate */ - NULL, /* poolDestroy */ - NULL, /* poolDelete */ - esxStoragePoolRefresh, /* poolRefresh */ - esxStoragePoolGetInfo, /* poolGetInfo */ - esxStoragePoolGetXMLDesc, /* poolGetXMLDesc */ - esxStoragePoolGetAutostart, /* poolGetAutostart */ - esxStoragePoolSetAutostart, /* poolSetAutostart */ - esxStoragePoolNumberOfStorageVolumes, /* poolNumOfVolumes */ - esxStoragePoolListStorageVolumes, /* poolListVolumes */ - esxStorageVolumeLookupByName, /* volLookupByName */ - esxStorageVolumeLookupByKey, /* volLookupByKey */ - esxStorageVolumeLookupByPath, /* volLookupByPath */ - esxStorageVolumeCreateXML, /* volCreateXML */ - esxStorageVolumeCreateXMLFrom, /* volCreateXMLFrom */ - NULL, /* volDownload */ - NULL, /* volUpload */ - esxStorageVolumeDelete, /* volDelete */ - esxStorageVolumeWipe, /* volWipe */ - esxStorageVolumeGetInfo, /* volGetInfo */ - esxStorageVolumeGetXMLDesc, /* volGetXMLDesc */ - esxStorageVolumeGetPath, /* volGetPath */ - esxStoragePoolIsActive, /* poolIsActive */ - esxStoragePoolIsPersistent, /* poolIsPersistent */ + .open = esxStorageOpen, + .close = esxStorageClose, + .numOfPools = esxNumberOfStoragePools, + .listPools = esxListStoragePools, + .numOfDefinedPools = esxNumberOfDefinedStoragePools, + .listDefinedPools = esxListDefinedStoragePools, + .poolLookupByName = esxStoragePoolLookupByName, + .poolLookupByUUID = esxStoragePoolLookupByUUID, + .poolLookupByVolume = esxStoragePoolLookupByVolume, + .poolRefresh = esxStoragePoolRefresh, + .poolGetInfo = esxStoragePoolGetInfo, + .poolGetXMLDesc = esxStoragePoolGetXMLDesc, + .poolGetAutostart = esxStoragePoolGetAutostart, + .poolSetAutostart = esxStoragePoolSetAutostart, + .poolNumOfVolumes = esxStoragePoolNumberOfStorageVolumes, + .poolListVolumes = esxStoragePoolListStorageVolumes, + .volLookupByName = esxStorageVolumeLookupByName, + .volLookupByKey = esxStorageVolumeLookupByKey, + .volLookupByPath = esxStorageVolumeLookupByPath, + .volCreateXML = esxStorageVolumeCreateXML, + .volCreateXMLFrom = esxStorageVolumeCreateXMLFrom, + .volDelete = esxStorageVolumeDelete, + .volWipe = esxStorageVolumeWipe, + .volGetInfo = esxStorageVolumeGetInfo, + .volGetXMLDesc = esxStorageVolumeGetXMLDesc, + .volGetPath = esxStorageVolumeGetPath, + .poolIsActive = esxStoragePoolIsActive, + .poolIsPersistent = esxStoragePoolIsPersistent, }; diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index cf0efb7..74b9638 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -542,20 +542,20 @@ cleanup: static virInterfaceDriver interfaceDriver = { "Interface", - interfaceOpenInterface, /* open */ - interfaceCloseInterface, /* close */ - interfaceNumOfInterfaces, /* numOfInterfaces */ - interfaceListInterfaces, /* listInterfaces */ - interfaceNumOfDefinedInterfaces, /* numOfInterfaces */ - interfaceListDefinedInterfaces, /* listInterfaces */ - interfaceLookupByName, /* interfaceLookupByName */ - interfaceLookupByMACString, /* interfaceLookupByMACString */ - interfaceGetXMLDesc, /* interfaceGetXMLDesc */ - interfaceDefineXML, /* interfaceDefineXML */ - interfaceUndefine, /* interfaceUndefine */ - interfaceCreate, /* interfaceCreate */ - interfaceDestroy, /* interfaceDestroy */ - interfaceIsActive, /* interfaceIsActive */ + .open = interfaceOpenInterface, + .close = interfaceCloseInterface, + .numOfInterfaces = interfaceNumOfInterfaces, + .listInterfaces = interfaceListInterfaces, + .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, + .listDefinedInterfaces = interfaceListDefinedInterfaces, + .interfaceLookupByName = interfaceLookupByName, + .interfaceLookupByMACString = interfaceLookupByMACString, + .interfaceGetXMLDesc = interfaceGetXMLDesc, + .interfaceDefineXML = interfaceDefineXML, + .interfaceUndefine = interfaceUndefine, + .interfaceCreate = interfaceCreate, + .interfaceDestroy = interfaceDestroy, + .interfaceIsActive = interfaceIsActive, }; int interfaceRegister(void) { diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 62a1e94..bc54e3e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2681,116 +2681,57 @@ libxlDomainEventDeregisterAny(virConnectPtr conn, int callbackID) static virDriver libxlDriver = { VIR_DRV_LIBXL, "xenlight", - libxlOpen, /* open */ - libxlClose, /* close */ - NULL, /* supports_feature */ - libxlGetType, /* type */ - libxlGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - libxlGetMaxVcpus, /* getMaxVcpus */ - libxlNodeGetInfo, /* nodeGetInfo */ - libxlGetCapabilities, /* getCapabilities */ - libxlListDomains, /* listDomains */ - libxlNumDomains, /* numOfDomains */ - libxlDomainCreateXML, /* domainCreateXML */ - libxlDomainLookupByID, /* domainLookupByID */ - libxlDomainLookupByUUID, /* domainLookupByUUID */ - libxlDomainLookupByName, /* domainLookupByName */ - libxlDomainSuspend, /* domainSuspend */ - libxlDomainResume, /* domainResume */ - libxlDomainShutdown, /* domainShutdown */ - libxlDomainReboot, /* domainReboot */ - libxlDomainDestroy, /* domainDestroy */ - libxlDomainGetOSType, /* domainGetOSType */ - libxlDomainGetMaxMemory, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - libxlDomainSetMemory, /* domainSetMemory */ - libxlDomainSetMemoryFlags, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - libxlDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - libxlDomainSetVcpus, /* domainSetVcpus */ - libxlDomainSetVcpusFlags, /* domainSetVcpusFlags */ - libxlDomainGetVcpusFlags, /* domainGetVcpusFlags */ - libxlDomainPinVcpu, /* domainPinVcpu */ - libxlDomainGetVcpus, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - libxlDomainGetXMLDesc, /* domainGetXMLDesc */ - libxlDomainXMLFromNative, /* domainXMLFromNative */ - libxlDomainXMLToNative, /* domainXMLToNative */ - libxlListDefinedDomains, /* listDefinedDomains */ - libxlNumDefinedDomains, /* numOfDefinedDomains */ - libxlDomainCreate, /* domainCreate */ - libxlDomainCreateWithFlags, /* domainCreateWithFlags */ - libxlDomainDefineXML, /* domainDefineXML */ - libxlDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - libxlDomainGetAutostart, /* domainGetAutostart */ - libxlDomainSetAutostart, /* domainSetAutostart */ - libxlDomainGetSchedulerType,/* domainGetSchedulerType */ - libxlDomainGetSchedulerParameters,/* domainGetSchedulerParameters */ - libxlDomainSetSchedulerParameters,/* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - libxlNodeGetFreeMemory, /* nodeGetFreeMemory */ - libxlDomainEventRegister, /* domainEventRegister */ - libxlDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - NULL, /* isEncrypted */ - NULL, /* isSecure */ - libxlDomainIsActive, /* domainIsActive */ - libxlDomainIsPersistent, /* domainIsPersistent */ - libxlDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - libxlDomainEventRegisterAny,/* domainEventRegisterAny */ - libxlDomainEventDeregisterAny,/* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = libxlOpen, + .close = libxlClose, + .type = libxlGetType, + .version = libxlGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = libxlGetMaxVcpus, + .nodeGetInfo = libxlNodeGetInfo, + .getCapabilities = libxlGetCapabilities, + .listDomains = libxlListDomains, + .numOfDomains = libxlNumDomains, + .domainCreateXML = libxlDomainCreateXML, + .domainLookupByID = libxlDomainLookupByID, + .domainLookupByUUID = libxlDomainLookupByUUID, + .domainLookupByName = libxlDomainLookupByName, + .domainSuspend = libxlDomainSuspend, + .domainResume = libxlDomainResume, + .domainShutdown = libxlDomainShutdown, + .domainReboot = libxlDomainReboot, + .domainDestroy = libxlDomainDestroy, + .domainGetOSType = libxlDomainGetOSType, + .domainGetMaxMemory = libxlDomainGetMaxMemory, + .domainSetMemory = libxlDomainSetMemory, + .domainSetMemoryFlags = libxlDomainSetMemoryFlags, + .domainGetInfo = libxlDomainGetInfo, + .domainSetVcpus = libxlDomainSetVcpus, + .domainSetVcpusFlags = libxlDomainSetVcpusFlags, + .domainGetVcpusFlags = libxlDomainGetVcpusFlags, + .domainPinVcpu = libxlDomainPinVcpu, + .domainGetVcpus = libxlDomainGetVcpus, + .domainGetXMLDesc = libxlDomainGetXMLDesc, + .domainXMLFromNative = libxlDomainXMLFromNative, + .domainXMLToNative = libxlDomainXMLToNative, + .listDefinedDomains = libxlListDefinedDomains, + .numOfDefinedDomains = libxlNumDefinedDomains, + .domainCreate = libxlDomainCreate, + .domainCreateWithFlags = libxlDomainCreateWithFlags, + .domainDefineXML = libxlDomainDefineXML, + .domainUndefine = libxlDomainUndefine, + .domainGetAutostart = libxlDomainGetAutostart, + .domainSetAutostart = libxlDomainSetAutostart, + .domainGetSchedulerType = libxlDomainGetSchedulerType, + .domainGetSchedulerParameters = libxlDomainGetSchedulerParameters, + .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, + .nodeGetFreeMemory = libxlNodeGetFreeMemory, + .domainEventRegister = libxlDomainEventRegister, + .domainEventDeregister = libxlDomainEventDeregister, + .domainIsActive = libxlDomainIsActive, + .domainIsPersistent = libxlDomainIsPersistent, + .domainIsUpdated = libxlDomainIsUpdated, + .domainEventRegisterAny = libxlDomainEventRegisterAny, + .domainEventDeregisterAny = libxlDomainEventDeregisterAny, }; static virStateDriver libxlStateDriver = { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7e754ee..1346336 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2708,116 +2708,53 @@ cleanup: static virDriver lxcDriver = { VIR_DRV_LXC, "LXC", - lxcOpen, /* open */ - lxcClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - lxcVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - lxcGetCapabilities, /* getCapabilities */ - lxcListDomains, /* listDomains */ - lxcNumDomains, /* numOfDomains */ - lxcDomainCreateAndStart, /* domainCreateXML */ - lxcDomainLookupByID, /* domainLookupByID */ - lxcDomainLookupByUUID, /* domainLookupByUUID */ - lxcDomainLookupByName, /* domainLookupByName */ - lxcDomainSuspend, /* domainSuspend */ - lxcDomainResume, /* domainResume */ - NULL, /* domainShutdown */ - NULL, /* domainReboot */ - lxcDomainDestroy, /* domainDestroy */ - lxcGetOSType, /* domainGetOSType */ - lxcDomainGetMaxMemory, /* domainGetMaxMemory */ - lxcDomainSetMaxMemory, /* domainSetMaxMemory */ - lxcDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - lxcDomainSetMemoryParameters, /* domainSetMemoryParameters */ - lxcDomainGetMemoryParameters, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - lxcDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - lxcDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - lxcListDefinedDomains, /* listDefinedDomains */ - lxcNumDefinedDomains, /* numOfDefinedDomains */ - lxcDomainStart, /* domainCreate */ - lxcDomainStartWithFlags, /* domainCreateWithFlags */ - lxcDomainDefine, /* domainDefineXML */ - lxcDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - lxcDomainGetAutostart, /* domainGetAutostart */ - lxcDomainSetAutostart, /* domainSetAutostart */ - lxcGetSchedulerType, /* domainGetSchedulerType */ - lxcGetSchedulerParameters, /* domainGetSchedulerParameters */ - lxcSetSchedulerParameters, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - lxcDomainInterfaceStats, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* nodeGetFreeMemory */ - lxcDomainEventRegister, /* domainEventRegister */ - lxcDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - lxcIsEncrypted, /* isEncrypted */ - lxcIsSecure, /* isSecure */ - lxcDomainIsActive, /* domainIsActive */ - lxcDomainIsPersistent, /* domainIsPersistent */ - lxcDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - lxcDomainEventRegisterAny, /* domainEventRegisterAny */ - lxcDomainEventDeregisterAny, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - lxcDomainOpenConsole, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = lxcOpen, + .close = lxcClose, + .version = lxcVersion, + .getHostname = virGetHostname, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = lxcGetCapabilities, + .listDomains = lxcListDomains, + .numOfDomains = lxcNumDomains, + .domainCreateXML = lxcDomainCreateAndStart, + .domainLookupByID = lxcDomainLookupByID, + .domainLookupByUUID = lxcDomainLookupByUUID, + .domainLookupByName = lxcDomainLookupByName, + .domainSuspend = lxcDomainSuspend, + .domainResume = lxcDomainResume, + .domainDestroy = lxcDomainDestroy, + .domainGetOSType = lxcGetOSType, + .domainGetMaxMemory = lxcDomainGetMaxMemory, + .domainSetMaxMemory = lxcDomainSetMaxMemory, + .domainSetMemory = lxcDomainSetMemory, + .domainSetMemoryParameters = lxcDomainSetMemoryParameters, + .domainGetMemoryParameters = lxcDomainGetMemoryParameters, + .domainGetInfo = lxcDomainGetInfo, + .domainGetXMLDesc = lxcDomainGetXMLDesc, + .listDefinedDomains = lxcListDefinedDomains, + .numOfDefinedDomains = lxcNumDefinedDomains, + .domainCreate = lxcDomainStart, + .domainCreateWithFlags = lxcDomainStartWithFlags, + .domainDefineXML = lxcDomainDefine, + .domainUndefine = lxcDomainUndefine, + .domainGetAutostart = lxcDomainGetAutostart, + .domainSetAutostart = lxcDomainSetAutostart, + .domainGetSchedulerType = lxcGetSchedulerType, + .domainGetSchedulerParameters = lxcGetSchedulerParameters, + .domainSetSchedulerParameters = lxcSetSchedulerParameters, + .domainInterfaceStats = lxcDomainInterfaceStats, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .nodeGetFreeMemory = nodeGetFreeMemory, + .domainEventRegister = lxcDomainEventRegister, + .domainEventDeregister = lxcDomainEventDeregister, + .isEncrypted = lxcIsEncrypted, + .isSecure = lxcIsSecure, + .domainIsActive = lxcDomainIsActive, + .domainIsPersistent = lxcDomainIsPersistent, + .domainIsUpdated = lxcDomainIsUpdated, + .domainEventRegisterAny = lxcDomainEventRegisterAny, + .domainEventDeregisterAny = lxcDomainEventDeregisterAny, + .domainOpenConsole = lxcDomainOpenConsole, }; static virStateDriver lxcStateDriver = { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d6030a4..00f32ad 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2504,23 +2504,23 @@ cleanup: static virNetworkDriver networkDriver = { "Network", - networkOpenNetwork, /* open */ - networkCloseNetwork, /* close */ - networkNumNetworks, /* numOfNetworks */ - networkListNetworks, /* listNetworks */ - networkNumDefinedNetworks, /* numOfDefinedNetworks */ - networkListDefinedNetworks, /* listDefinedNetworks */ - networkLookupByUUID, /* networkLookupByUUID */ - networkLookupByName, /* networkLookupByName */ - networkCreate, /* networkCreateXML */ - networkDefine, /* networkDefineXML */ - networkUndefine, /* networkUndefine */ - networkStart, /* networkCreate */ - networkDestroy, /* networkDestroy */ - networkGetXMLDesc, /* networkGetXMLDesc */ - networkGetBridgeName, /* networkGetBridgeName */ - networkGetAutostart, /* networkGetAutostart */ - networkSetAutostart, /* networkSetAutostart */ + .open = networkOpenNetwork, + .close = networkCloseNetwork, + .numOfNetworks = networkNumNetworks, + .listNetworks = networkListNetworks, + .numOfDefinedNetworks = networkNumDefinedNetworks, + .listDefinedNetworks = networkListDefinedNetworks, + .networkLookupByUUID = networkLookupByUUID, + .networkLookupByName = networkLookupByName, + .networkCreateXML = networkCreate, + .networkDefineXML = networkDefine, + .networkUndefine = networkUndefine, + .networkCreate = networkStart, + .networkDestroy = networkDestroy, + .networkGetXMLDesc = networkGetXMLDesc, + .networkGetBridgeName = networkGetBridgeName, + .networkGetAutostart = networkGetAutostart, + .networkSetAutostart = networkSetAutostart, networkIsActive, networkIsPersistent, }; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index b3edb3b..cac5d17 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1559,116 +1559,44 @@ cleanup: static virDriver openvzDriver = { VIR_DRV_OPENVZ, "OPENVZ", - openvzOpen, /* open */ - openvzClose, /* close */ - NULL, /* supports_feature */ - openvzGetType, /* type */ - openvzGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - openvzGetMaxVCPUs, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - openvzGetCapabilities, /* getCapabilities */ - openvzListDomains, /* listDomains */ - openvzNumDomains, /* numOfDomains */ - openvzDomainCreateXML, /* domainCreateXML */ - openvzDomainLookupByID, /* domainLookupByID */ - openvzDomainLookupByUUID, /* domainLookupByUUID */ - openvzDomainLookupByName, /* domainLookupByName */ - openvzDomainSuspend, /* domainSuspend */ - openvzDomainResume, /* domainResume */ - openvzDomainShutdown, /* domainShutdown */ - openvzDomainReboot, /* domainReboot */ - openvzDomainShutdown, /* domainDestroy */ - openvzGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - openvzDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - openvzDomainSetVcpus, /* domainSetVcpus */ - openvzDomainSetVcpusFlags, /* domainSetVcpusFlags */ - openvzDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - openvzDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - openvzListDefinedDomains, /* listDefinedDomains */ - openvzNumDefinedDomains, /* numOfDefinedDomains */ - openvzDomainCreate, /* domainCreate */ - openvzDomainCreateWithFlags, /* domainCreateWithFlags */ - openvzDomainDefineXML, /* domainDefineXML */ - openvzDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - openvzDomainGetAutostart, /* domainGetAutostart */ - openvzDomainSetAutostart, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - openvzIsEncrypted, - openvzIsSecure, - openvzDomainIsActive, - openvzDomainIsPersistent, - openvzDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = openvzOpen, + .close = openvzClose, + .type = openvzGetType, + .version = openvzGetVersion, + .getMaxVcpus = openvzGetMaxVCPUs, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = openvzGetCapabilities, + .listDomains = openvzListDomains, + .numOfDomains = openvzNumDomains, + .domainCreateXML = openvzDomainCreateXML, + .domainLookupByID = openvzDomainLookupByID, + .domainLookupByUUID = openvzDomainLookupByUUID, + .domainLookupByName = openvzDomainLookupByName, + .domainSuspend = openvzDomainSuspend, + .domainResume = openvzDomainResume, + .domainShutdown = openvzDomainShutdown, + .domainReboot = openvzDomainReboot, + .domainDestroy = openvzDomainShutdown, + .domainGetOSType = openvzGetOSType, + .domainGetInfo = openvzDomainGetInfo, + .domainSetVcpus = openvzDomainSetVcpus, + .domainSetVcpusFlags = openvzDomainSetVcpusFlags, + .domainGetVcpusFlags = openvzDomainGetVcpusFlags, + .domainGetMaxVcpus = openvzDomainGetMaxVcpus, + .domainGetXMLDesc = openvzDomainGetXMLDesc, + .listDefinedDomains = openvzListDefinedDomains, + .numOfDefinedDomains = openvzNumDefinedDomains, + .domainCreate = openvzDomainCreate, + .domainCreateWithFlags = openvzDomainCreateWithFlags, + .domainDefineXML = openvzDomainDefineXML, + .domainUndefine = openvzDomainUndefine, + .domainGetAutostart = openvzDomainGetAutostart, + .domainSetAutostart = openvzDomainSetAutostart, + .isEncrypted = openvzIsEncrypted, + .isSecure = openvzIsSecure, + .domainIsActive = openvzDomainIsActive, + .domainIsPersistent = openvzDomainIsPersistent, + .domainIsUpdated = openvzDomainIsUpdated, }; int openvzRegister(void) { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index af34297..e147495 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3720,116 +3720,32 @@ phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED) } static virDriver phypDriver = { - VIR_DRV_PHYP, "PHYP", phypOpen, /* open */ - phypClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - NULL, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - phypConnectGetCapabilities, /* getCapabilities */ - phypListDomains, /* listDomains */ - phypNumDomains, /* numOfDomains */ - phypDomainCreateAndStart, /* domainCreateXML */ - phypDomainLookupByID, /* domainLookupByID */ - NULL, /* domainLookupByUUID */ - phypDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - phypDomainResume, /* domainResume */ - phypDomainShutdown, /* domainShutdown */ - phypDomainReboot, /* domainReboot */ - phypDomainDestroy, /* domainDestroy */ - NULL, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - phypDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - phypDomainSetCPU, /* domainSetVcpus */ - phypDomainSetVcpusFlags, /* domainSetVcpusFlags */ - phypDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - phypGetLparCPUMAX, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - phypDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - phypListDefinedDomains, /* listDefinedDomains */ - phypNumDefinedDomains, /* numOfDefinedDomains */ - NULL, /* domainCreate */ - NULL, /* domainCreateWithFlags */ - NULL, /* domainDefineXML */ - NULL, /* domainUndefine */ - phypAttachDevice, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - phypIsEncrypted, /* isEncrypted */ - phypIsSecure, /* isSecure */ - NULL, /* domainIsActive */ - NULL, /* domainIsPersistent */ - phypIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + VIR_DRV_PHYP, + "PHYP", + .open = phypOpen, + .close = phypClose, + .getCapabilities = phypConnectGetCapabilities, + .listDomains = phypListDomains, + .numOfDomains = phypNumDomains, + .domainCreateXML = phypDomainCreateAndStart, + .domainLookupByID = phypDomainLookupByID, + .domainLookupByName = phypDomainLookupByName, + .domainResume = phypDomainResume, + .domainShutdown = phypDomainShutdown, + .domainReboot = phypDomainReboot, + .domainDestroy = phypDomainDestroy, + .domainGetInfo = phypDomainGetInfo, + .domainSetVcpus = phypDomainSetCPU, + .domainSetVcpusFlags = phypDomainSetVcpusFlags, + .domainGetVcpusFlags = phypDomainGetVcpusFlags, + .domainGetMaxVcpus = phypGetLparCPUMAX, + .domainGetXMLDesc = phypDomainGetXMLDesc, + .listDefinedDomains = phypListDefinedDomains, + .numOfDefinedDomains = phypNumDefinedDomains, + .domainAttachDevice = phypAttachDevice, + .isEncrypted = phypIsEncrypted, + .isSecure = phypIsSecure, + .domainIsUpdated = phypIsUpdated, }; static virStorageDriver phypStorageDriver = { @@ -3839,38 +3755,19 @@ static virStorageDriver phypStorageDriver = { .numOfPools = phypNumOfStoragePools, .listPools = phypListStoragePools, - .numOfDefinedPools = NULL, - .listDefinedPools = NULL, - .findPoolSources = NULL, .poolLookupByName = phypStoragePoolLookupByName, .poolLookupByUUID = phypGetStoragePoolLookUpByUUID, - .poolLookupByVolume = NULL, .poolCreateXML = phypStoragePoolCreateXML, - .poolDefineXML = NULL, - .poolBuild = NULL, - .poolUndefine = NULL, - .poolCreate = NULL, .poolDestroy = phypDestroyStoragePool, - .poolDelete = NULL, - .poolRefresh = NULL, - .poolGetInfo = NULL, .poolGetXMLDesc = phypGetStoragePoolXMLDesc, - .poolGetAutostart = NULL, - .poolSetAutostart = NULL, .poolNumOfVolumes = phypStoragePoolNumOfVolumes, .poolListVolumes = phypStoragePoolListVolumes, .volLookupByName = phypVolumeLookupByName, - .volLookupByKey = NULL, .volLookupByPath = phypVolumeLookupByPath, .volCreateXML = phypStorageVolCreateXML, - .volCreateXMLFrom = NULL, - .volDelete = NULL, - .volGetInfo = NULL, .volGetXMLDesc = phypVolumeGetXMLDesc, .volGetPath = phypVolumeGetPath, - .poolIsActive = NULL, - .poolIsPersistent = NULL }; static virInterfaceDriver phypInterfaceDriver = { @@ -3879,14 +3776,8 @@ static virInterfaceDriver phypInterfaceDriver = { .close = phypVIOSDriverClose, .numOfInterfaces = phypNumOfInterfaces, .listInterfaces = phypListInterfaces, - .numOfDefinedInterfaces = NULL, - .listDefinedInterfaces = NULL, .interfaceLookupByName = phypInterfaceLookupByName, - .interfaceLookupByMACString = NULL, - .interfaceGetXMLDesc = NULL, .interfaceDefineXML = phypInterfaceDefineXML, - .interfaceUndefine = NULL, - .interfaceCreate = NULL, .interfaceDestroy = phypInterfaceDestroy, .interfaceIsActive = phypInterfaceIsActive }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b2aa8d8..9156b79 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7224,116 +7224,112 @@ cleanup: static virDriver qemuDriver = { VIR_DRV_QEMU, "QEMU", - qemudOpen, /* open */ - qemudClose, /* close */ - qemudSupportsFeature, /* supports_feature */ - qemudGetType, /* type */ - qemudGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - qemuGetSysinfo, /* getSysinfo */ - qemudGetMaxVCPUs, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - qemudGetCapabilities, /* getCapabilities */ - qemudListDomains, /* listDomains */ - qemudNumDomains, /* numOfDomains */ - qemudDomainCreate, /* domainCreateXML */ - qemudDomainLookupByID, /* domainLookupByID */ - qemudDomainLookupByUUID, /* domainLookupByUUID */ - qemudDomainLookupByName, /* domainLookupByName */ - qemudDomainSuspend, /* domainSuspend */ - qemudDomainResume, /* domainResume */ - qemudDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ - qemudDomainDestroy, /* domainDestroy */ - qemudDomainGetOSType, /* domainGetOSType */ - qemudDomainGetMaxMemory, /* domainGetMaxMemory */ - qemudDomainSetMaxMemory, /* domainSetMaxMemory */ - qemudDomainSetMemory, /* domainSetMemory */ - qemudDomainSetMemoryFlags, /* domainSetMemoryFlags */ - qemuDomainSetMemoryParameters, /* domainSetMemoryParameters */ - qemuDomainGetMemoryParameters, /* domainGetMemoryParameters */ - qemuDomainSetBlkioParameters, /* domainSetBlkioParameters */ - qemuDomainGetBlkioParameters, /* domainGetBlkioParameters */ - qemudDomainGetInfo, /* domainGetInfo */ - qemudDomainSave, /* domainSave */ - qemuDomainRestore, /* domainRestore */ - qemudDomainCoreDump, /* domainCoreDump */ - qemuDomainScreenshot, /* domainScreenshot */ - qemudDomainSetVcpus, /* domainSetVcpus */ - qemudDomainSetVcpusFlags, /* domainSetVcpusFlags */ - qemudDomainGetVcpusFlags, /* domainGetVcpusFlags */ - qemudDomainPinVcpu, /* domainPinVcpu */ - qemudDomainGetVcpus, /* domainGetVcpus */ - qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */ - qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */ - qemudNodeGetSecurityModel, /* nodeGetSecurityModel */ - qemuDomainGetXMLDesc, /* domainGetXMLDesc */ - qemuDomainXMLFromNative, /* domainXMLFromNative */ - qemuDomainXMLToNative, /* domainXMLToNative */ - qemudListDefinedDomains, /* listDefinedDomains */ - qemudNumDefinedDomains, /* numOfDefinedDomains */ - qemudDomainStart, /* domainCreate */ - qemudDomainStartWithFlags, /* domainCreateWithFlags */ - qemudDomainDefine, /* domainDefineXML */ - qemudDomainUndefine, /* domainUndefine */ - qemuDomainAttachDevice, /* domainAttachDevice */ - qemuDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - qemuDomainDetachDevice, /* domainDetachDevice */ - qemuDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - qemuDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - qemudDomainGetAutostart, /* domainGetAutostart */ - qemudDomainSetAutostart, /* domainSetAutostart */ - qemuGetSchedulerType, /* domainGetSchedulerType */ - qemuGetSchedulerParameters, /* domainGetSchedulerParameters */ - qemuSetSchedulerParameters, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare (v1) */ - qemudDomainMigratePerform, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - qemudDomainBlockStats, /* domainBlockStats */ - qemudDomainInterfaceStats, /* domainInterfaceStats */ - qemudDomainMemoryStats, /* domainMemoryStats */ - qemudDomainBlockPeek, /* domainBlockPeek */ - qemudDomainMemoryPeek, /* domainMemoryPeek */ - qemuDomainGetBlockInfo, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* nodeGetFreeMemory */ - qemuDomainEventRegister, /* domainEventRegister */ - qemuDomainEventDeregister, /* domainEventDeregister */ - qemudDomainMigratePrepare2, /* domainMigratePrepare2 */ - qemudDomainMigrateFinish2, /* domainMigrateFinish2 */ - qemudNodeDeviceDettach, /* nodeDeviceDettach */ - qemudNodeDeviceReAttach, /* nodeDeviceReAttach */ - qemudNodeDeviceReset, /* nodeDeviceReset */ - qemudDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ - qemuIsEncrypted, /* isEncrypted */ - qemuIsSecure, /* isSecure */ - qemuDomainIsActive, /* domainIsActive */ - qemuDomainIsPersistent, /* domainIsPersistent */ - qemuDomainIsUpdated, /* domainIsUpdated */ - qemuCPUCompare, /* cpuCompare */ - qemuCPUBaseline, /* cpuBaseline */ - qemuDomainGetJobInfo, /* domainGetJobInfo */ - qemuDomainAbortJob, /* domainAbortJob */ - qemuDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */ - qemuDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */ - qemuDomainEventRegisterAny, /* domainEventRegisterAny */ - qemuDomainEventDeregisterAny, /* domainEventDeregisterAny */ - qemuDomainManagedSave, /* domainManagedSave */ - qemuDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ - qemuDomainManagedSaveRemove, /* domainManagedSaveRemove */ - qemuDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - qemuDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - qemuDomainSnapshotNum, /* domainSnapshotNum */ - qemuDomainSnapshotListNames, /* domainSnapshotListNames */ - qemuDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - qemuDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - qemuDomainSnapshotCurrent, /* domainSnapshotCurrent */ - qemuDomainRevertToSnapshot, /* domainRevertToSnapshot */ - qemuDomainSnapshotDelete, /* domainSnapshotDelete */ - qemuDomainMonitorCommand, /* qemuDomainMonitorCommand */ - qemuDomainOpenConsole, /* domainOpenConsole */ - qemuDomainInjectNMI, /* domainInjectNMI */ + .open = qemudOpen, + .close = qemudClose, + .supports_feature = qemudSupportsFeature, + .type = qemudGetType, + .version = qemudGetVersion, + .getHostname = virGetHostname, + .getSysinfo = qemuGetSysinfo, + .getMaxVcpus = qemudGetMaxVCPUs, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = qemudGetCapabilities, + .listDomains = qemudListDomains, + .numOfDomains = qemudNumDomains, + .domainCreateXML = qemudDomainCreate, + .domainLookupByID = qemudDomainLookupByID, + .domainLookupByUUID = qemudDomainLookupByUUID, + .domainLookupByName = qemudDomainLookupByName, + .domainSuspend = qemudDomainSuspend, + .domainResume = qemudDomainResume, + .domainShutdown = qemudDomainShutdown, + .domainDestroy = qemudDomainDestroy, + .domainGetOSType = qemudDomainGetOSType, + .domainGetMaxMemory = qemudDomainGetMaxMemory, + .domainSetMaxMemory = qemudDomainSetMaxMemory, + .domainSetMemory = qemudDomainSetMemory, + .domainSetMemoryFlags = qemudDomainSetMemoryFlags, + .domainSetMemoryParameters = qemuDomainSetMemoryParameters, + .domainGetMemoryParameters = qemuDomainGetMemoryParameters, + .domainSetBlkioParameters = qemuDomainSetBlkioParameters, + .domainGetBlkioParameters = qemuDomainGetBlkioParameters, + .domainGetInfo = qemudDomainGetInfo, + .domainSave = qemudDomainSave, + .domainRestore = qemuDomainRestore, + .domainCoreDump = qemudDomainCoreDump, + .domainScreenshot = qemuDomainScreenshot, + .domainSetVcpus = qemudDomainSetVcpus, + .domainSetVcpusFlags = qemudDomainSetVcpusFlags, + .domainGetVcpusFlags = qemudDomainGetVcpusFlags, + .domainPinVcpu = qemudDomainPinVcpu, + .domainGetVcpus = qemudDomainGetVcpus, + .domainGetMaxVcpus = qemudDomainGetMaxVcpus, + .domainGetSecurityLabel = qemudDomainGetSecurityLabel, + .nodeGetSecurityModel = qemudNodeGetSecurityModel, + .domainGetXMLDesc = qemuDomainGetXMLDesc, + .domainXMLFromNative = qemuDomainXMLFromNative, + .domainXMLToNative = qemuDomainXMLToNative, + .listDefinedDomains = qemudListDefinedDomains, + .numOfDefinedDomains = qemudNumDefinedDomains, + .domainCreate = qemudDomainStart, + .domainCreateWithFlags = qemudDomainStartWithFlags, + .domainDefineXML = qemudDomainDefine, + .domainUndefine = qemudDomainUndefine, + .domainAttachDevice = qemuDomainAttachDevice, + .domainAttachDeviceFlags = qemuDomainAttachDeviceFlags, + .domainDetachDevice = qemuDomainDetachDevice, + .domainDetachDeviceFlags = qemuDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = qemuDomainUpdateDeviceFlags, + .domainGetAutostart = qemudDomainGetAutostart, + .domainSetAutostart = qemudDomainSetAutostart, + .domainGetSchedulerType = qemuGetSchedulerType, + .domainGetSchedulerParameters = qemuGetSchedulerParameters, + .domainSetSchedulerParameters = qemuSetSchedulerParameters, + .domainMigratePerform = qemudDomainMigratePerform, + .domainBlockStats = qemudDomainBlockStats, + .domainInterfaceStats = qemudDomainInterfaceStats, + .domainMemoryStats = qemudDomainMemoryStats, + .domainBlockPeek = qemudDomainBlockPeek, + .domainMemoryPeek = qemudDomainMemoryPeek, + .domainGetBlockInfo = qemuDomainGetBlockInfo, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .nodeGetFreeMemory = nodeGetFreeMemory, + .domainEventRegister = qemuDomainEventRegister, + .domainEventDeregister = qemuDomainEventDeregister, + .domainMigratePrepare2 = qemudDomainMigratePrepare2, + .domainMigrateFinish2 = qemudDomainMigrateFinish2, + .nodeDeviceDettach = qemudNodeDeviceDettach, + .nodeDeviceReAttach = qemudNodeDeviceReAttach, + .nodeDeviceReset = qemudNodeDeviceReset, + .domainMigratePrepareTunnel = qemudDomainMigratePrepareTunnel, + .isEncrypted = qemuIsEncrypted, + .isSecure = qemuIsSecure, + .domainIsActive = qemuDomainIsActive, + .domainIsPersistent = qemuDomainIsPersistent, + .domainIsUpdated = qemuDomainIsUpdated, + .cpuCompare = qemuCPUCompare, + .cpuBaseline = qemuCPUBaseline, + .domainGetJobInfo = qemuDomainGetJobInfo, + .domainAbortJob = qemuDomainAbortJob, + .domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime, + .domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed, + .domainEventRegisterAny = qemuDomainEventRegisterAny, + .domainEventDeregisterAny = qemuDomainEventDeregisterAny, + .domainManagedSave = qemuDomainManagedSave, + .domainHasManagedSaveImage = qemuDomainHasManagedSaveImage, + .domainManagedSaveRemove = qemuDomainManagedSaveRemove, + .domainSnapshotCreateXML = qemuDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = qemuDomainSnapshotGetXMLDesc, + .domainSnapshotNum = qemuDomainSnapshotNum, + .domainSnapshotListNames = qemuDomainSnapshotListNames, + .domainSnapshotLookupByName = qemuDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = qemuDomainHasCurrentSnapshot, + .domainSnapshotCurrent = qemuDomainSnapshotCurrent, + .domainRevertToSnapshot = qemuDomainRevertToSnapshot, + .domainSnapshotDelete = qemuDomainSnapshotDelete, + .qemuDomainMonitorCommand = qemuDomainMonitorCommand, + .domainOpenConsole = qemuDomainOpenConsole, + .domainInjectNMI = qemuDomainInjectNMI, }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 5c6b0d8..09c1491 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6430,116 +6430,116 @@ unsigned long remoteVersion(void) static virDriver remote_driver = { VIR_DRV_REMOTE, "remote", - remoteOpen, /* open */ - remoteClose, /* close */ - remoteSupportsFeature, /* supports_feature */ - remoteType, /* type */ - remoteGetVersion, /* version */ - remoteGetLibVersion, /* libvirtVersion */ - remoteGetHostname, /* getHostname */ - remoteGetSysinfo, /* getSysinfo */ - remoteGetMaxVcpus, /* getMaxVcpus */ - remoteNodeGetInfo, /* nodeGetInfo */ - remoteGetCapabilities, /* getCapabilities */ - remoteListDomains, /* listDomains */ - remoteNumOfDomains, /* numOfDomains */ - remoteDomainCreateXML, /* domainCreateXML */ - remoteDomainLookupByID, /* domainLookupByID */ - remoteDomainLookupByUUID, /* domainLookupByUUID */ - remoteDomainLookupByName, /* domainLookupByName */ - remoteDomainSuspend, /* domainSuspend */ - remoteDomainResume, /* domainResume */ - remoteDomainShutdown, /* domainShutdown */ - remoteDomainReboot, /* domainReboot */ - remoteDomainDestroy, /* domainDestroy */ - remoteDomainGetOSType, /* domainGetOSType */ - remoteDomainGetMaxMemory, /* domainGetMaxMemory */ - remoteDomainSetMaxMemory, /* domainSetMaxMemory */ - remoteDomainSetMemory, /* domainSetMemory */ - remoteDomainSetMemoryFlags, /* domainSetMemoryFlags */ - remoteDomainSetMemoryParameters, /* domainSetMemoryParameters */ - remoteDomainGetMemoryParameters, /* domainGetMemoryParameters */ - remoteDomainSetBlkioParameters, /* domainSetBlkioParameters */ - remoteDomainGetBlkioParameters, /* domainGetBlkioParameters */ - remoteDomainGetInfo, /* domainGetInfo */ - remoteDomainSave, /* domainSave */ - remoteDomainRestore, /* domainRestore */ - remoteDomainCoreDump, /* domainCoreDump */ - remoteDomainScreenshot, /* domainScreenshot */ - remoteDomainSetVcpus, /* domainSetVcpus */ - remoteDomainSetVcpusFlags, /* domainSetVcpusFlags */ - remoteDomainGetVcpusFlags, /* domainGetVcpusFlags */ - remoteDomainPinVcpu, /* domainPinVcpu */ - remoteDomainGetVcpus, /* domainGetVcpus */ - remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */ - remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */ - remoteNodeGetSecurityModel, /* nodeGetSecurityModel */ - remoteDomainGetXMLDesc, /* domainGetXMLDesc */ - remoteDomainXMLFromNative, /* domainXMLFromNative */ - remoteDomainXMLToNative, /* domainXMLToNative */ - remoteListDefinedDomains, /* listDefinedDomains */ - remoteNumOfDefinedDomains, /* numOfDefinedDomains */ - remoteDomainCreate, /* domainCreate */ - remoteDomainCreateWithFlags, /* domainCreateWithFlags */ - remoteDomainDefineXML, /* domainDefineXML */ - remoteDomainUndefine, /* domainUndefine */ - remoteDomainAttachDevice, /* domainAttachDevice */ - remoteDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - remoteDomainDetachDevice, /* domainDetachDevice */ - remoteDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - remoteDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - remoteDomainGetAutostart, /* domainGetAutostart */ - remoteDomainSetAutostart, /* domainSetAutostart */ - remoteDomainGetSchedulerType, /* domainGetSchedulerType */ - remoteDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ - remoteDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ - remoteDomainMigratePrepare, /* domainMigratePrepare */ - remoteDomainMigratePerform, /* domainMigratePerform */ - remoteDomainMigrateFinish, /* domainMigrateFinish */ - remoteDomainBlockStats, /* domainBlockStats */ - remoteDomainInterfaceStats, /* domainInterfaceStats */ - remoteDomainMemoryStats, /* domainMemoryStats */ - remoteDomainBlockPeek, /* domainBlockPeek */ - remoteDomainMemoryPeek, /* domainMemoryPeek */ - remoteDomainGetBlockInfo, /* domainGetBlockInfo */ - remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - remoteNodeGetFreeMemory, /* nodeGetFreeMemory */ - remoteDomainEventRegister, /* domainEventRegister */ - remoteDomainEventDeregister, /* domainEventDeregister */ - remoteDomainMigratePrepare2, /* domainMigratePrepare2 */ - remoteDomainMigrateFinish2, /* domainMigrateFinish2 */ - remoteNodeDeviceDettach, /* nodeDeviceDettach */ - remoteNodeDeviceReAttach, /* nodeDeviceReAttach */ - remoteNodeDeviceReset, /* nodeDeviceReset */ - remoteDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ - remoteIsEncrypted, /* isEncrypted */ - remoteIsSecure, /* isSecure */ - remoteDomainIsActive, /* domainIsActive */ - remoteDomainIsPersistent, /* domainIsPersistent */ - remoteDomainIsUpdated, /* domainIsUpdated */ - remoteCPUCompare, /* cpuCompare */ - remoteCPUBaseline, /* cpuBaseline */ - remoteDomainGetJobInfo, /* domainGetJobInfo */ - remoteDomainAbortJob, /* domainAbortJob */ - remoteDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */ - remoteDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */ - remoteDomainEventRegisterAny, /* domainEventRegisterAny */ - remoteDomainEventDeregisterAny, /* domainEventDeregisterAny */ - remoteDomainManagedSave, /* domainManagedSave */ - remoteDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ - remoteDomainManagedSaveRemove, /* domainManagedSaveRemove */ - remoteDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - remoteDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - remoteDomainSnapshotNum, /* domainSnapshotNum */ - remoteDomainSnapshotListNames, /* domainSnapshotListNames */ - remoteDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - remoteDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - remoteDomainSnapshotCurrent, /* domainSnapshotCurrent */ - remoteDomainRevertToSnapshot, /* domainRevertToSnapshot */ - remoteDomainSnapshotDelete, /* domainSnapshotDelete */ - remoteQemuDomainMonitorCommand, /* qemuDomainMonitorCommand */ - remoteDomainOpenConsole, /* domainOpenConsole */ - remoteDomainInjectNMI, /* domainInjectNMI */ + .open = remoteOpen, + .close = remoteClose, + .supports_feature = remoteSupportsFeature, + .type = remoteType, + .version = remoteGetVersion, + .libvirtVersion = remoteGetLibVersion, + .getHostname = remoteGetHostname, + .getSysinfo = remoteGetSysinfo, + .getMaxVcpus = remoteGetMaxVcpus, + .nodeGetInfo = remoteNodeGetInfo, + .getCapabilities = remoteGetCapabilities, + .listDomains = remoteListDomains, + .numOfDomains = remoteNumOfDomains, + .domainCreateXML = remoteDomainCreateXML, + .domainLookupByID = remoteDomainLookupByID, + .domainLookupByUUID = remoteDomainLookupByUUID, + .domainLookupByName = remoteDomainLookupByName, + .domainSuspend = remoteDomainSuspend, + .domainResume = remoteDomainResume, + .domainShutdown = remoteDomainShutdown, + .domainReboot = remoteDomainReboot, + .domainDestroy = remoteDomainDestroy, + .domainGetOSType = remoteDomainGetOSType, + .domainGetMaxMemory = remoteDomainGetMaxMemory, + .domainSetMaxMemory = remoteDomainSetMaxMemory, + .domainSetMemory = remoteDomainSetMemory, + .domainSetMemoryFlags = remoteDomainSetMemoryFlags, + .domainSetMemoryParameters = remoteDomainSetMemoryParameters, + .domainGetMemoryParameters = remoteDomainGetMemoryParameters, + .domainSetBlkioParameters = remoteDomainSetBlkioParameters, + .domainGetBlkioParameters = remoteDomainGetBlkioParameters, + .domainGetInfo = remoteDomainGetInfo, + .domainSave = remoteDomainSave, + .domainRestore = remoteDomainRestore, + .domainCoreDump = remoteDomainCoreDump, + .domainScreenshot = remoteDomainScreenshot, + .domainSetVcpus = remoteDomainSetVcpus, + .domainSetVcpusFlags = remoteDomainSetVcpusFlags, + .domainGetVcpusFlags = remoteDomainGetVcpusFlags, + .domainPinVcpu = remoteDomainPinVcpu, + .domainGetVcpus = remoteDomainGetVcpus, + .domainGetMaxVcpus = remoteDomainGetMaxVcpus, + .domainGetSecurityLabel = remoteDomainGetSecurityLabel, + .nodeGetSecurityModel = remoteNodeGetSecurityModel, + .domainGetXMLDesc = remoteDomainGetXMLDesc, + .domainXMLFromNative = remoteDomainXMLFromNative, + .domainXMLToNative = remoteDomainXMLToNative, + .listDefinedDomains = remoteListDefinedDomains, + .numOfDefinedDomains = remoteNumOfDefinedDomains, + .domainCreate = remoteDomainCreate, + .domainCreateWithFlags = remoteDomainCreateWithFlags, + .domainDefineXML = remoteDomainDefineXML, + .domainUndefine = remoteDomainUndefine, + .domainAttachDevice = remoteDomainAttachDevice, + .domainAttachDeviceFlags = remoteDomainAttachDeviceFlags, + .domainDetachDevice = remoteDomainDetachDevice, + .domainDetachDeviceFlags = remoteDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = remoteDomainUpdateDeviceFlags, + .domainGetAutostart = remoteDomainGetAutostart, + .domainSetAutostart = remoteDomainSetAutostart, + .domainGetSchedulerType = remoteDomainGetSchedulerType, + .domainGetSchedulerParameters = remoteDomainGetSchedulerParameters, + .domainSetSchedulerParameters = remoteDomainSetSchedulerParameters, + .domainMigratePrepare = remoteDomainMigratePrepare, + .domainMigratePerform = remoteDomainMigratePerform, + .domainMigrateFinish = remoteDomainMigrateFinish, + .domainBlockStats = remoteDomainBlockStats, + .domainInterfaceStats = remoteDomainInterfaceStats, + .domainMemoryStats = remoteDomainMemoryStats, + .domainBlockPeek = remoteDomainBlockPeek, + .domainMemoryPeek = remoteDomainMemoryPeek, + .domainGetBlockInfo = remoteDomainGetBlockInfo, + .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, + .nodeGetFreeMemory = remoteNodeGetFreeMemory, + .domainEventRegister = remoteDomainEventRegister, + .domainEventDeregister = remoteDomainEventDeregister, + .domainMigratePrepare2 = remoteDomainMigratePrepare2, + .domainMigrateFinish2 = remoteDomainMigrateFinish2, + .nodeDeviceDettach = remoteNodeDeviceDettach, + .nodeDeviceReAttach = remoteNodeDeviceReAttach, + .nodeDeviceReset = remoteNodeDeviceReset, + .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel, + .isEncrypted = remoteIsEncrypted, + .isSecure = remoteIsSecure, + .domainIsActive = remoteDomainIsActive, + .domainIsPersistent = remoteDomainIsPersistent, + .domainIsUpdated = remoteDomainIsUpdated, + .cpuCompare = remoteCPUCompare, + .cpuBaseline = remoteCPUBaseline, + .domainGetJobInfo = remoteDomainGetJobInfo, + .domainAbortJob = remoteDomainAbortJob, + .domainMigrateSetMaxDowntime = remoteDomainMigrateSetMaxDowntime, + .domainMigrateSetMaxSpeed = remoteDomainMigrateSetMaxSpeed, + .domainEventRegisterAny = remoteDomainEventRegisterAny, + .domainEventDeregisterAny = remoteDomainEventDeregisterAny, + .domainManagedSave = remoteDomainManagedSave, + .domainHasManagedSaveImage = remoteDomainHasManagedSaveImage, + .domainManagedSaveRemove = remoteDomainManagedSaveRemove, + .domainSnapshotCreateXML = remoteDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = remoteDomainSnapshotGetXMLDesc, + .domainSnapshotNum = remoteDomainSnapshotNum, + .domainSnapshotListNames = remoteDomainSnapshotListNames, + .domainSnapshotLookupByName = remoteDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = remoteDomainHasCurrentSnapshot, + .domainSnapshotCurrent = remoteDomainSnapshotCurrent, + .domainRevertToSnapshot = remoteDomainRevertToSnapshot, + .domainSnapshotDelete = remoteDomainSnapshotDelete, + .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand, + .domainOpenConsole = remoteDomainOpenConsole, + .domainInjectNMI = remoteDomainInjectNMI, }; static virNetworkDriver network_driver = { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 3b5efa6..0e8d2bc 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5339,157 +5339,103 @@ static int testNWFilterClose(virConnectPtr conn) { static virDriver testDriver = { VIR_DRV_TEST, "Test", - testOpen, /* open */ - testClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - testGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - testGetMaxVCPUs, /* getMaxVcpus */ - testNodeGetInfo, /* nodeGetInfo */ - testGetCapabilities, /* getCapabilities */ - testListDomains, /* listDomains */ - testNumOfDomains, /* numOfDomains */ - testDomainCreateXML, /* domainCreateXML */ - testLookupDomainByID, /* domainLookupByID */ - testLookupDomainByUUID, /* domainLookupByUUID */ - testLookupDomainByName, /* domainLookupByName */ - testPauseDomain, /* domainSuspend */ - testResumeDomain, /* domainResume */ - testShutdownDomain, /* domainShutdown */ - testRebootDomain, /* domainReboot */ - testDestroyDomain, /* domainDestroy */ - testGetOSType, /* domainGetOSType */ - testGetMaxMemory, /* domainGetMaxMemory */ - testSetMaxMemory, /* domainSetMaxMemory */ - testSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - testGetDomainInfo, /* domainGetInfo */ - testDomainSave, /* domainSave */ - testDomainRestore, /* domainRestore */ - testDomainCoreDump, /* domainCoreDump */ - NULL, /* domainScreenshot */ - testSetVcpus, /* domainSetVcpus */ - testDomainSetVcpusFlags, /* domainSetVcpusFlags */ - testDomainGetVcpusFlags, /* domainGetVcpusFlags */ - testDomainPinVcpu, /* domainPinVcpu */ - testDomainGetVcpus, /* domainGetVcpus */ - testDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - testDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - testListDefinedDomains, /* listDefinedDomains */ - testNumOfDefinedDomains, /* numOfDefinedDomains */ - testDomainCreate, /* domainCreate */ - testDomainCreateWithFlags, /* domainCreateWithFlags */ - testDomainDefineXML, /* domainDefineXML */ - testDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - testDomainGetAutostart, /* domainGetAutostart */ - testDomainSetAutostart, /* domainSetAutostart */ - testDomainGetSchedulerType, /* domainGetSchedulerType */ - testDomainGetSchedulerParams, /* domainGetSchedulerParameters */ - testDomainSetSchedulerParams, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - testDomainBlockStats, /* domainBlockStats */ - testDomainInterfaceStats, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - testNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - NULL, /* nodeGetFreeMemory */ - testDomainEventRegister, /* domainEventRegister */ - testDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - testIsEncrypted, /* isEncrypted */ - testIsSecure, /* isEncrypted */ - testDomainIsActive, /* domainIsActive */ - testDomainIsPersistent, /* domainIsPersistent */ - testDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - testDomainEventRegisterAny, /* domainEventRegisterAny */ - testDomainEventDeregisterAny, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = testOpen, + .close = testClose, + .version = testGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = testGetMaxVCPUs, + .nodeGetInfo = testNodeGetInfo, + .getCapabilities = testGetCapabilities, + .listDomains = testListDomains, + .numOfDomains = testNumOfDomains, + .domainCreateXML = testDomainCreateXML, + .domainLookupByID = testLookupDomainByID, + .domainLookupByUUID = testLookupDomainByUUID, + .domainLookupByName = testLookupDomainByName, + .domainSuspend = testPauseDomain, + .domainResume = testResumeDomain, + .domainShutdown = testShutdownDomain, + .domainReboot = testRebootDomain, + .domainDestroy = testDestroyDomain, + .domainGetOSType = testGetOSType, + .domainGetMaxMemory = testGetMaxMemory, + .domainSetMaxMemory = testSetMaxMemory, + .domainSetMemory = testSetMemory, + .domainGetInfo = testGetDomainInfo, + .domainSave = testDomainSave, + .domainRestore = testDomainRestore, + .domainCoreDump = testDomainCoreDump, + .domainSetVcpus = testSetVcpus, + .domainSetVcpusFlags = testDomainSetVcpusFlags, + .domainGetVcpusFlags = testDomainGetVcpusFlags, + .domainPinVcpu = testDomainPinVcpu, + .domainGetVcpus = testDomainGetVcpus, + .domainGetMaxVcpus = testDomainGetMaxVcpus, + .domainGetXMLDesc = testDomainGetXMLDesc, + .listDefinedDomains = testListDefinedDomains, + .numOfDefinedDomains = testNumOfDefinedDomains, + .domainCreate = testDomainCreate, + .domainCreateWithFlags = testDomainCreateWithFlags, + .domainDefineXML = testDomainDefineXML, + .domainUndefine = testDomainUndefine, + .domainGetAutostart = testDomainGetAutostart, + .domainSetAutostart = testDomainSetAutostart, + .domainGetSchedulerType = testDomainGetSchedulerType, + .domainGetSchedulerParameters = testDomainGetSchedulerParams, + .domainSetSchedulerParameters = testDomainSetSchedulerParams, + .domainBlockStats = testDomainBlockStats, + .domainInterfaceStats = testDomainInterfaceStats, + .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, + .domainEventRegister = testDomainEventRegister, + .domainEventDeregister = testDomainEventDeregister, + .isEncrypted = testIsEncrypted, + .isSecure = testIsSecure, + .domainIsActive = testDomainIsActive, + .domainIsPersistent = testDomainIsPersistent, + .domainIsUpdated = testDomainIsUpdated, + .domainEventRegisterAny = testDomainEventRegisterAny, + .domainEventDeregisterAny = testDomainEventDeregisterAny, }; static virNetworkDriver testNetworkDriver = { "Test", - testOpenNetwork, /* open */ - testCloseNetwork, /* close */ - testNumNetworks, /* numOfNetworks */ - testListNetworks, /* listNetworks */ - testNumDefinedNetworks, /* numOfDefinedNetworks */ - testListDefinedNetworks, /* listDefinedNetworks */ - testLookupNetworkByUUID, /* networkLookupByUUID */ - testLookupNetworkByName, /* networkLookupByName */ - testNetworkCreate, /* networkCreateXML */ - testNetworkDefine, /* networkDefineXML */ - testNetworkUndefine, /* networkUndefine */ - testNetworkStart, /* networkCreate */ - testNetworkDestroy, /* networkDestroy */ - testNetworkGetXMLDesc, /* networkGetXMLDesc */ - testNetworkGetBridgeName, /* networkGetBridgeName */ - testNetworkGetAutostart, /* networkGetAutostart */ - testNetworkSetAutostart, /* networkSetAutostart */ - testNetworkIsActive, /* networkIsActive */ - testNetworkIsPersistent, /* networkIsPersistent */ + .open = testOpenNetwork, + .close = testCloseNetwork, + .numOfNetworks = testNumNetworks, + .listNetworks = testListNetworks, + .numOfDefinedNetworks = testNumDefinedNetworks, + .listDefinedNetworks = testListDefinedNetworks, + .networkLookupByUUID = testLookupNetworkByUUID, + .networkLookupByName = testLookupNetworkByName, + .networkCreateXML = testNetworkCreate, + .networkDefineXML = testNetworkDefine, + .networkUndefine = testNetworkUndefine, + .networkCreate = testNetworkStart, + .networkDestroy = testNetworkDestroy, + .networkGetXMLDesc = testNetworkGetXMLDesc, + .networkGetBridgeName = testNetworkGetBridgeName, + .networkGetAutostart = testNetworkGetAutostart, + .networkSetAutostart = testNetworkSetAutostart, + .networkIsActive = testNetworkIsActive, + .networkIsPersistent = testNetworkIsPersistent, }; static virInterfaceDriver testInterfaceDriver = { "Test", /* name */ - testOpenInterface, /* open */ - testCloseInterface, /* close */ - testNumOfInterfaces, /* numOfInterfaces */ - testListInterfaces, /* listInterfaces */ - testNumOfDefinedInterfaces, /* numOfDefinedInterfaces */ - testListDefinedInterfaces, /* listDefinedInterfaces */ - testLookupInterfaceByName, /* interfaceLookupByName */ - testLookupInterfaceByMACString, /* interfaceLookupByMACString */ - testInterfaceGetXMLDesc, /* interfaceGetXMLDesc */ - testInterfaceDefineXML, /* interfaceDefineXML */ - testInterfaceUndefine, /* interfaceUndefine */ - testInterfaceCreate, /* interfaceCreate */ - testInterfaceDestroy, /* interfaceDestroy */ - testInterfaceIsActive, /* interfaceIsActive */ + .open = testOpenInterface, + .close = testCloseInterface, + .numOfInterfaces = testNumOfInterfaces, + .listInterfaces = testListInterfaces, + .numOfDefinedInterfaces = testNumOfDefinedInterfaces, + .listDefinedInterfaces = testListDefinedInterfaces, + .interfaceLookupByName = testLookupInterfaceByName, + .interfaceLookupByMACString = testLookupInterfaceByMACString, + .interfaceGetXMLDesc = testInterfaceGetXMLDesc, + .interfaceDefineXML = testInterfaceDefineXML, + .interfaceUndefine = testInterfaceUndefine, + .interfaceCreate = testInterfaceCreate, + .interfaceDestroy = testInterfaceDestroy, + .interfaceIsActive = testInterfaceIsActive, }; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 50eca53..9813972 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2146,116 +2146,48 @@ cleanup: static virDriver umlDriver = { VIR_DRV_UML, "UML", - umlOpen, /* open */ - umlClose, /* close */ - NULL, /* supports_feature */ - umlGetType, /* type */ - umlGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - umlGetCapabilities, /* getCapabilities */ - umlListDomains, /* listDomains */ - umlNumDomains, /* numOfDomains */ - umlDomainCreate, /* domainCreateXML */ - umlDomainLookupByID, /* domainLookupByID */ - umlDomainLookupByUUID, /* domainLookupByUUID */ - umlDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ - umlDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ - umlDomainDestroy, /* domainDestroy */ - umlDomainGetOSType, /* domainGetOSType */ - umlDomainGetMaxMemory, /* domainGetMaxMemory */ - umlDomainSetMaxMemory, /* domainSetMaxMemory */ - umlDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - umlDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - umlDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - umlListDefinedDomains, /* listDefinedDomains */ - umlNumDefinedDomains, /* numOfDefinedDomains */ - umlDomainStart, /* domainCreate */ - umlDomainStartWithFlags, /* domainCreateWithFlags */ - umlDomainDefine, /* domainDefineXML */ - umlDomainUndefine, /* domainUndefine */ - umlDomainAttachDevice, /* domainAttachDevice */ - umlDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - umlDomainDetachDevice, /* domainDetachDevice */ - umlDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - umlDomainGetAutostart, /* domainGetAutostart */ - umlDomainSetAutostart, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - umlDomainBlockPeek, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - umlIsEncrypted, /* isEncrypted */ - umlIsSecure, /* isSecure */ - umlDomainIsActive, /* domainIsActive */ - umlDomainIsPersistent, /* domainIsPersistent */ - umlDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - umlDomainOpenConsole, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = umlOpen, + .close = umlClose, + .type = umlGetType, + .version = umlGetVersion, + .getHostname = virGetHostname, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = umlGetCapabilities, + .listDomains = umlListDomains, + .numOfDomains = umlNumDomains, + .domainCreateXML = umlDomainCreate, + .domainLookupByID = umlDomainLookupByID, + .domainLookupByUUID = umlDomainLookupByUUID, + .domainLookupByName = umlDomainLookupByName, + .domainShutdown = umlDomainShutdown, + .domainDestroy = umlDomainDestroy, + .domainGetOSType = umlDomainGetOSType, + .domainGetMaxMemory = umlDomainGetMaxMemory, + .domainSetMaxMemory = umlDomainSetMaxMemory, + .domainSetMemory = umlDomainSetMemory, + .domainGetInfo = umlDomainGetInfo, + .domainGetXMLDesc = umlDomainGetXMLDesc, + .listDefinedDomains = umlListDefinedDomains, + .numOfDefinedDomains = umlNumDefinedDomains, + .domainCreate = umlDomainStart, + .domainCreateWithFlags = umlDomainStartWithFlags, + .domainDefineXML = umlDomainDefine, + .domainUndefine = umlDomainUndefine, + .domainAttachDevice = umlDomainAttachDevice, + .domainAttachDeviceFlags = umlDomainAttachDeviceFlags, + .domainDetachDevice = umlDomainDetachDevice, + .domainDetachDeviceFlags = umlDomainDetachDeviceFlags, + .domainGetAutostart = umlDomainGetAutostart, + .domainSetAutostart = umlDomainSetAutostart, + .domainBlockPeek = umlDomainBlockPeek, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .nodeGetFreeMemory = nodeGetFreeMemory, + .isEncrypted = umlIsEncrypted, + .isSecure = umlIsSecure, + .domainIsActive = umlDomainIsActive, + .domainIsPersistent = umlDomainIsPersistent, + .domainIsUpdated = umlDomainIsUpdated, + .domainOpenConsole = umlDomainOpenConsole, }; static int diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 41b6795..c737263 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -8663,130 +8663,71 @@ endjob: virDriver NAME(Driver) = { VIR_DRV_VBOX, "VBOX", - vboxOpen, /* open */ - vboxClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - vboxGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - vboxGetMaxVcpus, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - vboxGetCapabilities, /* getCapabilities */ - vboxListDomains, /* listDomains */ - vboxNumOfDomains, /* numOfDomains */ - vboxDomainCreateXML, /* domainCreateXML */ - vboxDomainLookupByID, /* domainLookupByID */ - vboxDomainLookupByUUID, /* domainLookupByUUID */ - vboxDomainLookupByName, /* domainLookupByName */ - vboxDomainSuspend, /* domainSuspend */ - vboxDomainResume, /* domainResume */ - vboxDomainShutdown, /* domainShutdown */ - vboxDomainReboot, /* domainReboot */ - vboxDomainDestroy, /* domainDestroy */ - vboxDomainGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - vboxDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - vboxDomainGetInfo, /* domainGetInfo */ - vboxDomainSave, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ + .open = vboxOpen, + .close = vboxClose, + .version = vboxGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = vboxGetMaxVcpus, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = vboxGetCapabilities, + .listDomains = vboxListDomains, + .numOfDomains = vboxNumOfDomains, + .domainCreateXML = vboxDomainCreateXML, + .domainLookupByID = vboxDomainLookupByID, + .domainLookupByUUID = vboxDomainLookupByUUID, + .domainLookupByName = vboxDomainLookupByName, + .domainSuspend = vboxDomainSuspend, + .domainResume = vboxDomainResume, + .domainShutdown = vboxDomainShutdown, + .domainReboot = vboxDomainReboot, + .domainDestroy = vboxDomainDestroy, + .domainGetOSType = vboxDomainGetOSType, + .domainSetMemory = vboxDomainSetMemory, + .domainGetInfo = vboxDomainGetInfo, + .domainSave = vboxDomainSave, + .domainSetVcpus = vboxDomainSetVcpus, + .domainSetVcpusFlags = vboxDomainSetVcpusFlags, + .domainGetVcpusFlags = vboxDomainGetVcpusFlags, + .domainGetMaxVcpus = vboxDomainGetMaxVcpus, + .domainGetXMLDesc = vboxDomainGetXMLDesc, + .listDefinedDomains = vboxListDefinedDomains, + .numOfDefinedDomains = vboxNumOfDefinedDomains, + .domainCreate = vboxDomainCreate, + .domainCreateWithFlags = vboxDomainCreateWithFlags, + .domainDefineXML = vboxDomainDefineXML, + .domainUndefine = vboxDomainUndefine, + .domainAttachDevice = vboxDomainAttachDevice, + .domainAttachDeviceFlags = vboxDomainAttachDeviceFlags, + .domainDetachDevice = vboxDomainDetachDevice, + .domainDetachDeviceFlags = vboxDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = vboxDomainUpdateDeviceFlags, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .nodeGetFreeMemory = nodeGetFreeMemory, #if VBOX_API_VERSION == 4000 - vboxDomainScreenshot, /* domainScreenshot */ -#else - NULL, /* domainScreenshot */ + .domainScreenshot = vboxDomainScreenshot, #endif - vboxDomainSetVcpus, /* domainSetVcpus */ - vboxDomainSetVcpusFlags, /* domainSetVcpusFlags */ - vboxDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - vboxDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - vboxDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - vboxListDefinedDomains, /* listDefinedDomains */ - vboxNumOfDefinedDomains, /* numOfDefinedDomains */ - vboxDomainCreate, /* domainCreate */ - vboxDomainCreateWithFlags, /* domainCreateWithFlags */ - vboxDomainDefineXML, /* domainDefineXML */ - vboxDomainUndefine, /* domainUndefine */ - vboxDomainAttachDevice, /* domainAttachDevice */ - vboxDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - vboxDomainDetachDevice, /* domainDetachDevice */ - vboxDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - vboxDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* getFreeMemory */ -#if VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000 - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ -#else - vboxDomainEventRegister, /* domainEventRegister */ - vboxDomainEventDeregister, /* domainEventDeregister */ +#if VBOX_API_VERSION != 2002 && VBOX_API_VERSION != 4000 + .domainEventRegister = vboxDomainEventRegister, + .domainEventDeregister = vboxDomainEventDeregister, #endif - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - vboxIsEncrypted, /* isEncrypted */ - vboxIsSecure, /* isSecure */ - vboxDomainIsActive, /* domainIsActive */ - vboxDomainIsPersistent, /* domainIsPersistent */ - vboxDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ -#if VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000 - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ -#else - vboxDomainEventRegisterAny, /* domainEventRegisterAny */ - vboxDomainEventDeregisterAny, /* domainEventDeregisterAny */ + .isEncrypted = vboxIsEncrypted, + .isSecure = vboxIsSecure, + .domainIsActive = vboxDomainIsActive, + .domainIsPersistent = vboxDomainIsPersistent, + .domainIsUpdated = vboxDomainIsUpdated, +#if VBOX_API_VERSION != 2002 && VBOX_API_VERSION != 4000 + .domainEventRegisterAny = vboxDomainEventRegisterAny, + .domainEventDeregisterAny = vboxDomainEventDeregisterAny, #endif - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - vboxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - vboxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - vboxDomainSnapshotNum, /* domainSnapshotNum */ - vboxDomainSnapshotListNames, /* domainSnapshotListNames */ - vboxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - vboxDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - vboxDomainSnapshotCurrent, /* domainSnapshotCurrent */ - vboxDomainRevertToSnapshot, /* domainRevertToSnapshot */ - vboxDomainSnapshotDelete, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .domainSnapshotCreateXML = vboxDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = vboxDomainSnapshotGetXMLDesc, + .domainSnapshotNum = vboxDomainSnapshotNum, + .domainSnapshotListNames = vboxDomainSnapshotListNames, + .domainSnapshotLookupByName = vboxDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = vboxDomainHasCurrentSnapshot, + .domainSnapshotCurrent = vboxDomainSnapshotCurrent, + .domainRevertToSnapshot = vboxDomainRevertToSnapshot, + .domainSnapshotDelete = vboxDomainSnapshotDelete, }; virNetworkDriver NAME(NetworkDriver) = { @@ -8805,9 +8746,6 @@ virNetworkDriver NAME(NetworkDriver) = { .networkCreate = vboxNetworkCreate, .networkDestroy = vboxNetworkDestroy, .networkGetXMLDesc = vboxNetworkGetXMLDesc, - .networkGetBridgeName = NULL, - .networkGetAutostart = NULL, - .networkSetAutostart = NULL }; virStorageDriver NAME(StorageDriver) = { @@ -8816,24 +8754,7 @@ virStorageDriver NAME(StorageDriver) = { .close = vboxStorageClose, .numOfPools = vboxStorageNumOfPools, .listPools = vboxStorageListPools, - .numOfDefinedPools = NULL, - .listDefinedPools = NULL, - .findPoolSources = NULL, .poolLookupByName = vboxStoragePoolLookupByName, - .poolLookupByUUID = NULL, - .poolLookupByVolume = NULL, - .poolCreateXML = NULL, - .poolDefineXML = NULL, - .poolBuild = NULL, - .poolUndefine = NULL, - .poolCreate = NULL, - .poolDestroy = NULL, - .poolDelete = NULL, - .poolRefresh = NULL, - .poolGetInfo = NULL, - .poolGetXMLDesc = NULL, - .poolGetAutostart = NULL, - .poolSetAutostart = NULL, .poolNumOfVolumes = vboxStoragePoolNumOfVolumes, .poolListVolumes = vboxStoragePoolListVolumes, @@ -8841,7 +8762,6 @@ virStorageDriver NAME(StorageDriver) = { .volLookupByKey = vboxStorageVolLookupByKey, .volLookupByPath = vboxStorageVolLookupByPath, .volCreateXML = vboxStorageVolCreateXML, - .volCreateXMLFrom = NULL, .volDelete = vboxStorageVolDelete, .volGetInfo = vboxStorageVolGetInfo, .volGetXMLDesc = vboxStorageVolGetXMLDesc, diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index c1a21c4..44876ba 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -899,116 +899,32 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) static virDriver vmwareDriver = { VIR_DRV_VMWARE, "VMWARE", - vmwareOpen, /* open */ - vmwareClose, /* close */ - NULL, /* supports_feature */ - vmwareGetType, /* type */ - vmwareGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - NULL, /* getCapabilities */ - vmwareListDomains, /* listDomains */ - vmwareNumDomains, /* numOfDomains */ - vmwareDomainCreateXML, /* domainCreateXML */ - vmwareDomainLookupByID, /* domainLookupByID */ - vmwareDomainLookupByUUID, /* domainLookupByUUID */ - vmwareDomainLookupByName, /* domainLookupByName */ - vmwareDomainSuspend, /* domainSuspend */ - vmwareDomainResume, /* domainResume */ - vmwareDomainShutdown, /* domainShutdown */ - vmwareDomainReboot, /* domainReboot */ - vmwareDomainShutdown, /* domainDestroy */ - vmwareGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - vmwareDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - vmwareDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - vmwareListDefinedDomains, /* listDefinedDomains */ - vmwareNumDefinedDomains, /* numOfDefinedDomains */ - vmwareDomainCreate, /* domainCreate */ - vmwareDomainCreateWithFlags,/* domainCreateWithFlags */ - vmwareDomainDefineXML, /* domainDefineXML */ - vmwareDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - NULL, /* isEncrypted */ - NULL, /* isSecure */ - vmwareDomainIsActive, /* domainIsActive */ - vmwareDomainIsPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = vmwareOpen, + .close = vmwareClose, + .type = vmwareGetType, + .version = vmwareGetVersion, + .listDomains = vmwareListDomains, + .numOfDomains = vmwareNumDomains, + .domainCreateXML = vmwareDomainCreateXML, + .domainLookupByID = vmwareDomainLookupByID, + .domainLookupByUUID = vmwareDomainLookupByUUID, + .domainLookupByName = vmwareDomainLookupByName, + .domainSuspend = vmwareDomainSuspend, + .domainResume = vmwareDomainResume, + .domainShutdown = vmwareDomainShutdown, + .domainReboot = vmwareDomainReboot, + .domainDestroy = vmwareDomainShutdown, + .domainGetOSType = vmwareGetOSType, + .domainGetInfo = vmwareDomainGetInfo, + .domainGetXMLDesc = vmwareDomainGetXMLDesc, + .listDefinedDomains = vmwareListDefinedDomains, + .numOfDefinedDomains = vmwareNumDefinedDomains, + .domainCreate = vmwareDomainCreate, + .domainCreateWithFlags = vmwareDomainCreateWithFlags, + .domainDefineXML = vmwareDomainDefineXML, + .domainUndefine = vmwareDomainUndefine, + .domainIsActive = vmwareDomainIsActive, + .domainIsPersistent = vmwareDomainIsPersistent, }; int diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index ca4c498..953d09e 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2101,116 +2101,80 @@ cleanup: static virDriver xenUnifiedDriver = { VIR_DRV_XEN_UNIFIED, "Xen", - xenUnifiedOpen, /* open */ - xenUnifiedClose, /* close */ - xenUnifiedSupportsFeature, /* supports_feature */ - xenUnifiedType, /* type */ - xenUnifiedGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - xenUnifiedGetMaxVcpus, /* getMaxVcpus */ - xenUnifiedNodeGetInfo, /* nodeGetInfo */ - xenUnifiedGetCapabilities, /* getCapabilities */ - xenUnifiedListDomains, /* listDomains */ - xenUnifiedNumOfDomains, /* numOfDomains */ - xenUnifiedDomainCreateXML, /* domainCreateXML */ - xenUnifiedDomainLookupByID, /* domainLookupByID */ - xenUnifiedDomainLookupByUUID, /* domainLookupByUUID */ - xenUnifiedDomainLookupByName, /* domainLookupByName */ - xenUnifiedDomainSuspend, /* domainSuspend */ - xenUnifiedDomainResume, /* domainResume */ - xenUnifiedDomainShutdown, /* domainShutdown */ - xenUnifiedDomainReboot, /* domainReboot */ - xenUnifiedDomainDestroy, /* domainDestroy */ - xenUnifiedDomainGetOSType, /* domainGetOSType */ - xenUnifiedDomainGetMaxMemory, /* domainGetMaxMemory */ - xenUnifiedDomainSetMaxMemory, /* domainSetMaxMemory */ - xenUnifiedDomainSetMemory, /* domainSetMemory */ - NULL, /*domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - xenUnifiedDomainGetInfo, /* domainGetInfo */ - xenUnifiedDomainSave, /* domainSave */ - xenUnifiedDomainRestore, /* domainRestore */ - xenUnifiedDomainCoreDump, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenUnifiedDomainSetVcpus, /* domainSetVcpus */ - xenUnifiedDomainSetVcpusFlags, /* domainSetVcpusFlags */ - xenUnifiedDomainGetVcpusFlags, /* domainGetVcpusFlags */ - xenUnifiedDomainPinVcpu, /* domainPinVcpu */ - xenUnifiedDomainGetVcpus, /* domainGetVcpus */ - xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - xenUnifiedDomainGetXMLDesc, /* domainGetXMLDesc */ - xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */ - xenUnifiedDomainXMLToNative, /* domainXMLToNative */ - xenUnifiedListDefinedDomains, /* listDefinedDomains */ - xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */ - xenUnifiedDomainCreate, /* domainCreate */ - xenUnifiedDomainCreateWithFlags, /* domainCreateWithFlags */ - xenUnifiedDomainDefineXML, /* domainDefineXML */ - xenUnifiedDomainUndefine, /* domainUndefine */ - xenUnifiedDomainAttachDevice, /* domainAttachDevice */ - xenUnifiedDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - xenUnifiedDomainDetachDevice, /* domainDetachDevice */ - xenUnifiedDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - xenUnifiedDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - xenUnifiedDomainGetAutostart, /* domainGetAutostart */ - xenUnifiedDomainSetAutostart, /* domainSetAutostart */ - xenUnifiedDomainGetSchedulerType, /* domainGetSchedulerType */ - xenUnifiedDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ - xenUnifiedDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ - xenUnifiedDomainMigratePrepare, /* domainMigratePrepare */ - xenUnifiedDomainMigratePerform, /* domainMigratePerform */ - xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */ - xenUnifiedDomainBlockStats, /* domainBlockStats */ - xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - xenUnifiedDomainBlockPeek, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - xenUnifiedNodeGetFreeMemory, /* nodeGetFreeMemory */ - xenUnifiedDomainEventRegister, /* domainEventRegister */ - xenUnifiedDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - xenUnifiedNodeDeviceDettach, /* nodeDeviceDettach */ - xenUnifiedNodeDeviceReAttach, /* nodeDeviceReAttach */ - xenUnifiedNodeDeviceReset, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - xenUnifiedIsEncrypted, /* isEncrypted */ - xenUnifiedIsSecure, /* isSecure */ - xenUnifiedDomainIsActive, /* domainIsActive */ - xenUnifiedDomainIsPersistent, /* domainIsPersistent */ - xenUnifiedDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - xenUnifiedDomainEventRegisterAny, /* domainEventRegisterAny */ - xenUnifiedDomainEventDeregisterAny, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - xenUnifiedDomainOpenConsole, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = xenUnifiedOpen, + .close = xenUnifiedClose, + .supports_feature = xenUnifiedSupportsFeature, + .type = xenUnifiedType, + .version = xenUnifiedGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = xenUnifiedGetMaxVcpus, + .nodeGetInfo = xenUnifiedNodeGetInfo, + .getCapabilities = xenUnifiedGetCapabilities, + .listDomains = xenUnifiedListDomains, + .numOfDomains = xenUnifiedNumOfDomains, + .domainCreateXML = xenUnifiedDomainCreateXML, + .domainLookupByID = xenUnifiedDomainLookupByID, + .domainLookupByUUID = xenUnifiedDomainLookupByUUID, + .domainLookupByName = xenUnifiedDomainLookupByName, + .domainSuspend = xenUnifiedDomainSuspend, + .domainResume = xenUnifiedDomainResume, + .domainShutdown = xenUnifiedDomainShutdown, + .domainReboot = xenUnifiedDomainReboot, + .domainDestroy = xenUnifiedDomainDestroy, + .domainGetOSType = xenUnifiedDomainGetOSType, + .domainGetMaxMemory = xenUnifiedDomainGetMaxMemory, + .domainSetMaxMemory = xenUnifiedDomainSetMaxMemory, + .domainSetMemory = xenUnifiedDomainSetMemory, + .domainGetInfo = xenUnifiedDomainGetInfo, + .domainSave = xenUnifiedDomainSave, + .domainRestore = xenUnifiedDomainRestore, + .domainCoreDump = xenUnifiedDomainCoreDump, + .domainSetVcpus = xenUnifiedDomainSetVcpus, + .domainSetVcpusFlags = xenUnifiedDomainSetVcpusFlags, + .domainGetVcpusFlags = xenUnifiedDomainGetVcpusFlags, + .domainPinVcpu = xenUnifiedDomainPinVcpu, + .domainGetVcpus = xenUnifiedDomainGetVcpus, + .domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus, + .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc, + .domainXMLFromNative = xenUnifiedDomainXMLFromNative, + .domainXMLToNative = xenUnifiedDomainXMLToNative, + .listDefinedDomains = xenUnifiedListDefinedDomains, + .numOfDefinedDomains = xenUnifiedNumOfDefinedDomains, + .domainCreate = xenUnifiedDomainCreate, + .domainCreateWithFlags = xenUnifiedDomainCreateWithFlags, + .domainDefineXML = xenUnifiedDomainDefineXML, + .domainUndefine = xenUnifiedDomainUndefine, + .domainAttachDevice = xenUnifiedDomainAttachDevice, + .domainAttachDeviceFlags = xenUnifiedDomainAttachDeviceFlags, + .domainDetachDevice = xenUnifiedDomainDetachDevice, + .domainDetachDeviceFlags = xenUnifiedDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = xenUnifiedDomainUpdateDeviceFlags, + .domainGetAutostart = xenUnifiedDomainGetAutostart, + .domainSetAutostart = xenUnifiedDomainSetAutostart, + .domainGetSchedulerType = xenUnifiedDomainGetSchedulerType, + .domainGetSchedulerParameters = xenUnifiedDomainGetSchedulerParameters, + .domainSetSchedulerParameters = xenUnifiedDomainSetSchedulerParameters, + .domainMigratePrepare = xenUnifiedDomainMigratePrepare, + .domainMigratePerform = xenUnifiedDomainMigratePerform, + .domainMigrateFinish = xenUnifiedDomainMigrateFinish, + .domainBlockStats = xenUnifiedDomainBlockStats, + .domainInterfaceStats = xenUnifiedDomainInterfaceStats, + .domainBlockPeek = xenUnifiedDomainBlockPeek, + .nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory, + .nodeGetFreeMemory = xenUnifiedNodeGetFreeMemory, + .domainEventRegister = xenUnifiedDomainEventRegister, + .domainEventDeregister = xenUnifiedDomainEventDeregister, + .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, + .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, + .nodeDeviceReset = xenUnifiedNodeDeviceReset, + .isEncrypted = xenUnifiedIsEncrypted, + .isSecure = xenUnifiedIsSecure, + .domainIsActive = xenUnifiedDomainIsActive, + .domainIsPersistent = xenUnifiedDomainIsPersistent, + .domainIsUpdated = xenUnifiedDomainIsUpdated, + .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny, + .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, + .domainOpenConsole = xenUnifiedDomainOpenConsole, }; /** diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 0a1f7de..6bfc163 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1781,116 +1781,49 @@ xenapiNodeGetCellsFreeMemory (virConnectPtr conn, unsigned long long *freeMems, static virDriver xenapiDriver = { VIR_DRV_XENAPI, "XenAPI", - xenapiOpen, /* open */ - xenapiClose, /* close */ - xenapiSupportsFeature, /* supports_feature */ - xenapiType, /* type */ - xenapiGetVersion, /* version */ - NULL, /* libvirtVersion */ - xenapiGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - xenapiGetMaxVcpus, /* getMaxVcpus */ - xenapiNodeGetInfo, /* nodeGetInfo */ - xenapiGetCapabilities, /* getCapabilities */ - xenapiListDomains, /* listDomains */ - xenapiNumOfDomains, /* numOfDomains */ - xenapiDomainCreateXML, /* domainCreateXML */ - xenapiDomainLookupByID, /* domainLookupByID */ - xenapiDomainLookupByUUID, /* domainLookupByUUID */ - xenapiDomainLookupByName, /* domainLookupByName */ - xenapiDomainSuspend, /* domainSuspend */ - xenapiDomainResume, /* domainResume */ - xenapiDomainShutdown, /* domainShutdown */ - xenapiDomainReboot, /* domainReboot */ - xenapiDomainDestroy, /* domainDestroy */ - xenapiDomainGetOSType, /* domainGetOSType */ - xenapiDomainGetMaxMemory, /* domainGetMaxMemory */ - xenapiDomainSetMaxMemory, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - xenapiDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenapiDomainSetVcpus, /* domainSetVcpus */ - xenapiDomainSetVcpusFlags, /* domainSetVcpusFlags */ - xenapiDomainGetVcpusFlags, /* domainGetVcpusFlags */ - xenapiDomainPinVcpu, /* domainPinVcpu */ - xenapiDomainGetVcpus, /* domainGetVcpus */ - xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - xenapiDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - xenapiListDefinedDomains, /* listDefinedDomains */ - xenapiNumOfDefinedDomains, /* numOfDefinedDomains */ - xenapiDomainCreate, /* domainCreate */ - xenapiDomainCreateWithFlags, /* domainCreateWithFlags */ - xenapiDomainDefineXML, /* domainDefineXML */ - xenapiDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - xenapiDomainGetAutostart, /* domainGetAutostart */ - xenapiDomainSetAutostart, /* domainSetAutostart */ - xenapiDomainGetSchedulerType, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - xenapiNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - xenapiNodeGetFreeMemory, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - NULL, /* isEncrypted */ - NULL, /* isSecure */ - NULL, /* domainIsActive */ - NULL, /* domainIsPersistent */ - xenapiDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .open = xenapiOpen, + .close = xenapiClose, + .supports_feature = xenapiSupportsFeature, + .type = xenapiType, + .version = xenapiGetVersion, + .getHostname = xenapiGetHostname, + .getMaxVcpus = xenapiGetMaxVcpus, + .nodeGetInfo = xenapiNodeGetInfo, + .getCapabilities = xenapiGetCapabilities, + .listDomains = xenapiListDomains, + .numOfDomains = xenapiNumOfDomains, + .domainCreateXML = xenapiDomainCreateXML, + .domainLookupByID = xenapiDomainLookupByID, + .domainLookupByUUID = xenapiDomainLookupByUUID, + .domainLookupByName = xenapiDomainLookupByName, + .domainSuspend = xenapiDomainSuspend, + .domainResume = xenapiDomainResume, + .domainShutdown = xenapiDomainShutdown, + .domainReboot = xenapiDomainReboot, + .domainDestroy = xenapiDomainDestroy, + .domainGetOSType = xenapiDomainGetOSType, + .domainGetMaxMemory = xenapiDomainGetMaxMemory, + .domainSetMaxMemory = xenapiDomainSetMaxMemory, + .domainGetInfo = xenapiDomainGetInfo, + .domainSetVcpus = xenapiDomainSetVcpus, + .domainSetVcpusFlags = xenapiDomainSetVcpusFlags, + .domainGetVcpusFlags = xenapiDomainGetVcpusFlags, + .domainPinVcpu = xenapiDomainPinVcpu, + .domainGetVcpus = xenapiDomainGetVcpus, + .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, + .domainGetXMLDesc = xenapiDomainGetXMLDesc, + .listDefinedDomains = xenapiListDefinedDomains, + .numOfDefinedDomains = xenapiNumOfDefinedDomains, + .domainCreate = xenapiDomainCreate, + .domainCreateWithFlags = xenapiDomainCreateWithFlags, + .domainDefineXML = xenapiDomainDefineXML, + .domainUndefine = xenapiDomainUndefine, + .domainGetAutostart = xenapiDomainGetAutostart, + .domainSetAutostart = xenapiDomainSetAutostart, + .domainGetSchedulerType = xenapiDomainGetSchedulerType, + .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, + .nodeGetFreeMemory = xenapiNodeGetFreeMemory, + .domainIsUpdated = xenapiDomainIsUpdated, }; /** -- 1.7.4.4
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
Change all the driver struct initializers to use the C99 style, leaving out unused fields. This will make it possible to add new APIs without changing every driver. eg change:
qemudDomainResume, /* domainResume */ qemudDomainShutdown, /* domainShutdown */ NULL, /* domainReboot */ qemudDomainDestroy, /* domainDestroy */
to
.domainResume = qemudDomainResume, .domainShutdown = qemudDomainShutdown, .domainDestroy = qemudDomainDestroy,
And get rid of any existing C99 style initializersr which
s/initializersr/initializers/ ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
The hvsupport.html.in file is forever out of date. By annotating the driver struct tables in each driver with version information, we can auto-generate the hvsupport.html.in file. Annotating the drivers will be mandatory for new patches, ensuring hvsupport.html.in is never out of date again. * docs/hvsupport.html.in: Delete * hvsupport.pl: Script to generate hvsupport.html.in * Makefile.am: Autogenerate hvsupport.html.in --- docs/Makefile.am | 10 +- docs/hvsupport.html.in | 801 ------------------------------------------------ docs/hvsupport.pl | 353 +++++++++++++++++++++ 3 files changed, 360 insertions(+), 804 deletions(-) delete mode 100644 docs/hvsupport.html.in create mode 100644 docs/hvsupport.pl diff --git a/docs/Makefile.am b/docs/Makefile.am index db4bc59..12b3fcd 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -60,7 +60,7 @@ gif = \ architecture.gif \ node.gif -dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) todo.html.in \ +dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) todo.html.in hvsupport.html.in \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) dot_html = $(dot_html_in:%.html.in=%.html) @@ -86,7 +86,7 @@ EXTRA_DIST= \ $(xml) $(fig) $(png) $(css) \ $(patches) \ sitemap.html.in \ - todo.pl todo.cfg-example + todo.pl hvsupport.pl todo.cfg-example MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ @@ -113,6 +113,10 @@ todo: rm -f todo.html.in $(MAKE) todo.html +hvsupport.html.in: hvsupport.pl $(srcdir)/../src/libvirt_public.syms \ + $(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/driver.h + $(AM_V_GEN)$(PERL) $(srcdir)/$< $(srcdir)/../src > $@ || { rm $@ && exit 1; } + .PHONY: todo %.png: %.fig @@ -183,7 +187,7 @@ clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html maintainer-clean-local: clean-local - rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in + rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in hvsupport.html.in rebuild: api all diff --git a/docs/hvsupport.html.in b/docs/hvsupport.html.in deleted file mode 100644 index 4cc2634..0000000 --- a/docs/hvsupport.html.in +++ /dev/null @@ -1,801 +0,0 @@ -<?xml version="1.0"?> -<html> - <body> - <h1>Driver support matrix</h1> - <p> -This page documents which <a href="html/">libvirt calls</a> work on -which libvirt drivers / hypervisors, and which version the API appeared -in. -</p> - <p> -This information changes frequently. This page was last checked or -updated on <i>2008-06-05</i>. -</p> - <h3>Domain functions</h3> - <p> x = not supported; empty cell means no information </p> - <table class="top_table"> - <tr> - <th> Function </th> - <th> Since </th> - <th><a href="drvxen.html">Xen</a></th> - <th><a href="drvqemu.html">QEMU</a></th> - <th><a href="drvkvm.html">KVM</a></th> - <th><a href="remote.html">Remote</a></th> - <th><a href="drvvbox.html">VirtualBox</a></th> - <th><a href="drvone.html">ONE</a></th> - <th><a href="drvesx.html">ESX</a></th> - </tr> - <tr> - <td> virConnectClose </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectGetCapabilities </td> - <td> 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.1 </td> - </tr> - <tr> - <td> virConnectGetHostname </td> - <td> 0.3.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.3.3 </td> - <td> ≥ 0.3.3 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectGetMaxVcpus </td> - <td> 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virConnectGetType </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectGetURI </td> - <td> 0.3.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectGetVersion </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectListDefinedDomains </td> - <td> 0.1.5 </td> - <td> ≥ 0.1.9 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectListDomains </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectNumOfDefinedDomains </td> - <td> 0.1.5 </td> - <td> ≥ 0.1.9 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectNumOfDomains </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectOpen </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> x </td> - </tr> - <tr> - <td> virConnectOpenAuth </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virConnectOpenReadOnly </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainAttachDevice </td> - <td> 0.1.9 </td> - <td> ≥ 0.1.9 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainBlockPeek </td> - <td> 0.4.3 </td> - <td> 0.4.3 </td> - <td> 0.4.3 </td> - <td> 0.4.3 </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainBlockStats </td> - <td> 0.3.2 </td> - <td> ≥ 0.3.2 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.2 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainCoreDump </td> - <td> 0.1.9 </td> - <td> ≥ 0.1.9 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainCreate </td> - <td> 0.1.5 </td> - <td> ≥ 0.1.9 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainCreateLinux </td> - <td> All </td> - <td> ≥ 0.0.5 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> x </td> - </tr> - <tr> - <td> virDomainDefineXML </td> - <td> 0.1.5 </td> - <td> ≥ 0.1.9 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.2 </td> - </tr> - <tr> - <td> virDomainDestroy </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainDetachDevice </td> - <td> 0.1.9 </td> - <td> ≥ 0.1.9 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainFree </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetAutostart </td> - <td> 0.2.1 </td> - <td> x </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainGetConnect </td> - <td> 0.3.0 </td> - <td colspan="7"> not a HV function </td> - </tr> - <tr> - <td> virDomainGetID </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetInfo </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetMaxMemory </td> - <td> All </td> - <td> All </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetMaxVcpus </td> - <td> 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetName </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetOSType </td> - <td> All </td> - <td> All </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetSchedulerParameters </td> - <td> 0.2.3 </td> - <td> ≥ 0.2.3 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetSchedulerType </td> - <td> 0.2.3 </td> - <td> ≥ 0.2.3 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetUUID </td> - <td> 0.1.10 </td> - <td> ≥ 0.1.10 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetUUIDString </td> - <td> 0.1.10 </td> - <td> ≥ 0.1.10 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainGetVcpus </td> - <td> 0.1.4 </td> - <td> ≥ 0.1.4 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainInterfaceStats </td> - <td> 0.3.2 </td> - <td> ≥ 0.3.2 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.2 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainGetXMLDesc </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainLookupByID </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainLookupByName </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainLookupByUUID </td> - <td> 0.1.10 </td> - <td> ≥ 0.1.10 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainLookupByUUIDString </td> - <td> 0.1.10 </td> - <td> ≥ 0.1.10 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainMigrate </td> - <td> 0.3.2 </td> - <td> ≥ 0.3.2 </td> - <td> x </td> - <td> x </td> - <td> 0.3.2 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainPinVcpu </td> - <td> 0.1.4 </td> - <td> ≥ 0.1.4 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainReboot </td> - <td> 0.1.0 </td> - <td> ≥ 0.1.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainRestore </td> - <td> All </td> - <td> All </td> - <td> x </td> - <td> ≥ 0.3.2 </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainResume </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainSave </td> - <td> All </td> - <td> All </td> - <td> x </td> - <td> ≥ 0.3.2 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainSetAutostart </td> - <td> 0.2.1 </td> - <td> x </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.2.1 </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virDomainSetMaxMemory </td> - <td> All </td> - <td> All </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainSetMemory </td> - <td> 0.1.1 </td> - <td> ≥ 0.1.1 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainSetSchedulerParameters </td> - <td> 0.2.3 </td> - <td> ≥ 0.2.3 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainSetVcpus </td> - <td> 0.1.4 </td> - <td> ≥ 0.1.4 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.3.0 </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainShutdown </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainSuspend </td> - <td> All </td> - <td> All </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virDomainUndefine </td> - <td> 0.1.5 </td> - <td> ≥ 0.1.9 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> ≥ 0.6.4 </td> - <td> ≥ 0.7.1 </td> - </tr> - <tr> - <td> virGetVersion </td> - <td> All </td> - <td> All </td> - <td colspan="6"> Returns -1 if HV unsupported. </td> - </tr> - <tr> - <td> virInitialize </td> - <td> 0.1.0 </td> - <td colspan="7"> not a HV function </td> - </tr> - <tr> - <td> virDomainMemoryPeek </td> - <td> 0.4.3 </td> - <td> x </td> - <td> 0.4.3 </td> - <td> 0.4.3 </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - <tr> - <td> virNodeGetInfo </td> - <td> 0.1.0 </td> - <td> ≥ 0.1.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.2.0 </td> - <td> ≥ 0.3.0 </td> - <td> ≥ 0.6.3 </td> - <td> x </td> - <td> ≥ 0.7.0 </td> - </tr> - <tr> - <td> virNodeGetFreeMemory </td> - <td> 0.3.3 </td> - <td> ≥ 0.3.3 </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> ≥ 0.7.2 </td> - </tr> - <tr> - <td> virNodeGetCellsFreeMemory </td> - <td> 0.3.3 </td> - <td> ≥ 0.3.3 </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - <td> x </td> - </tr> - </table> - <h3>Network functions</h3> - <p> -Network functions are not hypervisor-specific.They require the libvirtd -daemon to be running. Most network functions first appeared in libvirt 0.2.0. -</p> - <table class="top_table"> - <tr> - <th> Function </th> - <th> Since </th> - </tr> - <tr> - <td> virConnectNumOfNetworks </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virConnectListNetworks </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virConnectNumOfDefinedNetworks </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virConnectListDefinedNetworks </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkCreate </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkCreateXML </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkDefineXML </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkDestroy </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkFree </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkGetAutostart </td> - <td> 0.2.1 </td> - </tr> - <tr> - <td> virNetworkGetConnect </td> - <td> 0.3.0 </td> - </tr> - <tr> - <td> virNetworkGetBridgeName </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkGetName </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkGetUUID </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkGetUUIDString </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkGetXMLDesc </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkLookupByName </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkLookupByUUID </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkLookupByUUIDString </td> - <td> 0.2.0 </td> - </tr> - <tr> - <td> virNetworkSetAutostart </td> - <td> 0.2.1 </td> - </tr> - <tr> - <td> virNetworkUndefine </td> - <td> 0.2.0 </td> - </tr> - </table> - </body> -</html> diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl new file mode 100644 index 0000000..5cfb824 --- /dev/null +++ b/docs/hvsupport.pl @@ -0,0 +1,353 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use File::Find; + +die "syntax: $0 SRCDIR\n" unless int(@ARGV) == 1; + +my $srcdir = shift @ARGV; + +my $symslibvirt = "$srcdir/libvirt_public.syms"; +my $symsqemu = "$srcdir/libvirt_qemu.syms"; +my $drivertable = "$srcdir/driver.h"; + +my %groupheaders = ( + "virDriver" => "Hypervisor APIs", + "virNetworkDriver" => "Virtual Network APIs", + "virInterfaceDriver" => "Host Interface APIs", + "virDeviceMonitor" => "Host Device APIs", + "virStorageDriver" => "Storage Pool APIs", + "virSecretDriver" => "Secret APIs", + "virNWFilterDriver" => "Network Filter APIs", + ); + + +my @srcs; +find({ + wanted => sub { + if (m!$srcdir/.*/\w+_(driver|tmpl)\.c$!) { + push @srcs, $_ if $_ !~ /vbox_driver\.c/; + } + }, no_chdir => 1}, $srcdir); +my $line; + +# Get the list of all public APIs and their corresponding version + +my %apis; +open FILE, "<$symslibvirt" + or die "cannot read $symslibvirt: $!"; + +my $vers; +my $prevvers; +while (defined($line = <FILE>)) { + chomp $line; + next if $line =~ /^\s*#/; + next if $line =~ /^\s*$/; + next if $line =~ /^\s*(global|local):/; + if ($line =~ /^\s*LIBVIRT_(\d+\.\d+\.\d+)\s*{\s*$/) { + if (defined $vers) { + die "malformed syms file"; + } + $vers = $1; + } elsif ($line =~ /\s*}\s*;\s*$/) { + if (defined $prevvers) { + die "malformed syms file"; + } + $prevvers = $vers; + $vers = undef; + } elsif ($line =~ /\s*}\s*LIBVIRT_(\d+\.\d+\.\d+)\s*;\s*$/) { + if ($1 ne $prevvers) { + die "malformed syms file $1 != $vers"; + } + $prevvers = $vers; + $vers = undef; + } elsif ($line =~ /\s*(\w+)\s*;\s*$/) { + $apis{$1} = $vers; + } else { + die "unexpected data $line\n"; + } +} + +close FILE; + + +# And the same for the QEMU specific APIs + +open FILE, "<$symsqemu" + or die "cannot read $symsqemu: $!"; + +$prevvers = undef; +$vers = undef; +while (defined($line = <FILE>)) { + chomp $line; + next if $line =~ /^\s*#/; + next if $line =~ /^\s*$/; + next if $line =~ /^\s*(global|local):/; + if ($line =~ /^\s*LIBVIRT_QEMU_(\d+\.\d+\.\d+)\s*{\s*$/) { + if (defined $vers) { + die "malformed syms file"; + } + $vers = $1; + } elsif ($line =~ /\s*}\s*;\s*$/) { + if (defined $prevvers) { + die "malformed syms file"; + } + $prevvers = $vers; + $vers = undef; + } elsif ($line =~ /\s*}\s*LIBVIRT_QEMU_(\d+\.\d+\.\d+)\s*;\s*$/) { + if ($1 ne $prevvers) { + die "malformed syms file $1 != $vers"; + } + $prevvers = $vers; + $vers = undef; + } elsif ($line =~ /\s*(\w+)\s*;\s*$/) { + $apis{$1} = $vers; + } else { + die "unexpected data $line\n"; + } +} + +close FILE; + + + +# Now we want to get the mapping between public APIs +# and driver struct fields. This lets us later match +# update the driver impls with the public APis. + +open FILE, "<$drivertable" + or die "cannot read $drivertable: $!"; + +# Group name -> hash of APIs { fields -> api name } +my %groups; + +# XXX handle these better +my %apisecret = qw( + DrvSupportsFeature virConnectDrvSupportsFeature + DomainMigratePrepare virDomainMigratePrepare + DomainMigratePerform virDomainMigratePerform + DomainMigrateFinish virDomainMigrateFinish + DomainMigratePrepare2 virDomainMigratePrepare2 + DomainMigrateFinish2 virDomainMigrateFinish2 + DomainMigratePrepareTunnel virDomainMigratePrepareTunnel + ); + +foreach my $field (keys %apisecret) { + my $api = $apisecret{$field}; + $apis{$api} = "0.0.0"; +} + +my $ingrp; +while (defined($line = <FILE>)) { + if ($line =~ /struct _(vir\w*Driver)/) { + my $grp = $1; + if ($grp ne "virStateDriver" && + $grp ne "virStreamDriver") { + $ingrp = $grp; + $groups{$ingrp} = { apis => {}, drivers => {} }; + } + } elsif ($ingrp) { + if ($line =~ /^\s*virDrv(\w+)\s+(\w+);\s*$/) { + my $field = $2; + my $name = $1; + + my $api; + if (exists $apis{"vir$name"}) { + $api = "vir$name"; + } elsif (exists $apis{"virConnect$name"}) { + $api = "virConnect$name"; + } else { + die "driver $name does not have a public API"; + } + $groups{$ingrp}->{apis}->{$field} = $api; + } elsif ($line =~ /};/) { + $ingrp = undef; + } + } +} + +close FILE; + + +# Finally, we read all the primary driver files and extract +# the driver API tables from each one. + +foreach my $src (@srcs) { + open FILE, "<$src" or + die "cannot read $src: $!"; + + $ingrp = undef; + my $impl; + while (defined($line = <FILE>)) { + if (!$ingrp) { + foreach my $grp (keys %groups) { + if ($line =~ /^\s*(?:static\s+)?$grp\s+(\w+)\s*=\s*{/ || + $line =~ /^\s*(?:static\s+)?$grp\s+NAME\(\w+\)\s*=\s*{/) { + $ingrp = $grp; + $impl = $src; + $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; + $groups{$ingrp}->{drivers}->{$impl} = {}; + } + } + + } else { + if ($line =~ m!\s*\.(\w+)\s*=\s*(\w+)\s*,?\s*(?:/\*\s*(\d+\.\d+\.\d+)\s*\*/\s*)?$!) { + my $api = $1; + my $meth = $2; + my $vers = $3; + + $vers = "Y" unless defined $vers; + + die "Driver method for $api is NULL in $src" if $meth eq "NULL"; + + if (!exists($groups{$ingrp}->{apis}->{$api})) { + die "Found unexpected driver $api in $ingrp\n"; + } + + $groups{$ingrp}->{drivers}->{$impl}->{$api} = $vers; + } elsif ($line =~ /}/) { + $ingrp = undef; + } + } + } + + close FILE; +} + + +# The '.open' driver method is used for 3 public APIs, so we +# have a bit of manual fixup todo with the per-driver versioning +# and support matrix + +$groups{virDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth"; +$groups{virDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly"; + +my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0; + +foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { + my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; + my $openVers; + if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { + $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; + } + + # virConnectOpenReadOnly always matches virConnectOpen version + $groups{"virDriver"}->{drivers}->{$drv}->{"openReadOnly"} = + $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; + + # virConnectOpenAuth is always 0.4.0 if the driver existed + # before this time, otherwise it matches the version of + # the driver's virConnectOpen entry + if ($openVersStr eq "Y" || + $openVers >= $openAuthVers) { + $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = $openVersStr; + } else { + $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = "0.4.0"; + } +} + + +# Another special case for the virDomainCreateLinux which was replaced +# with virDomainCreateXML +$groups{virDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux"; + +my $createAPIVers = (0 * 1000 * 1000) + (0 * 1000) + 3; + +foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { + my $createVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateXML"}; + next unless defined $createVersStr; + my $createVers; + if ($createVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { + $createVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; + } + + # virCreateLinux is always 0.0.3 if the driver existed + # before this time, otherwise it matches the version of + # the driver's virCreateXML entry + if ($createVersStr eq "Y" || + $createVers >= $createAPIVers) { + $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; + } else { + $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; + } +} + + +# Finally we generate the HTML file with the tables + +print <<EOF; +<html> +<head> +<title>libvirt API support matrix</title> +</head> +<body> +<h1>libvirt API support matrix</h1> + +<ul id="toc"></ul> + +<p> +This page documents which <a href="html/">libvirt calls</a> work on +which libvirt drivers / hypervisors, and which version the API appeared +in. +</p> + +EOF + +foreach my $grp (sort { $a cmp $b } keys %groups) { + print "<h2><a name=\"$grp\">", $groupheaders{$grp}, "</a></h2>\n"; + print <<EOF; +<table class="top_table"> +<thead> +<tr> +<th>API</th> +<th>Version</th> +EOF + + foreach my $drv (sort { $a cmp $b } keys %{$groups{$grp}->{drivers}}) { + print " <th>$drv</th>\n"; + } + + print <<EOF; +</tr> +</thead> +<tbody> +EOF + + foreach my $field (sort { + $groups{$grp}->{apis}->{$a} + cmp + $groups{$grp}->{apis}->{$b} + } keys %{$groups{$grp}->{apis}}) { + my $api = $groups{$grp}->{apis}->{$field}; + my $vers = $apis{$api}; + print <<EOF; +<tr> +<td><a href=\"html/libvirt-libvirt.html#$api\">$api</a></td> +<td>$vers</td> +EOF + + foreach my $drv (sort {$a cmp $b } keys %{$groups{$grp}->{drivers}}) { + if (exists $groups{$grp}->{drivers}->{$drv}->{$field}) { + print "<td>", $groups{$grp}->{drivers}->{$drv}->{$field}, "</td>\n"; + } else { + print "<td></td>\n"; + } + } + + print <<EOF; +</tr> +EOF + } + + print <<EOF; +</tbody> +</table> +EOF +} + +print <<EOF; +</body> +</html> +EOF -- 1.7.4.4
* .gitignore: Ignore recently added file. --- I'm pushing this as a trivial followup. .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 87a105f..a15100c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ /configure /configure.lineno /daemon/*_dispatch_*.h +/docs/hvsupport.html.in /gnulib/ /libtool /libvirt-*.tar.gz -- 1.7.4.4
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is forever out of date. By annotating the driver struct tables in each driver with version information, we can auto-generate the hvsupport.html.in file. Annotating the drivers will be mandatory for new patches, ensuring hvsupport.html.in is never out of date again.
* docs/hvsupport.html.in: Delete * hvsupport.pl: Script to generate hvsupport.html.in * Makefile.am: Autogenerate hvsupport.html.in --- docs/Makefile.am | 10 +- docs/hvsupport.html.in | 801 ------------------------------------------------ docs/hvsupport.pl | 353 +++++++++++++++++++++ 3 files changed, 360 insertions(+), 804 deletions(-) delete mode 100644 docs/hvsupport.html.in create mode 100644 docs/hvsupport.pl
Hmm, that should probably be mode 100755, since it is an executable script. I'm pushing that obvious fix. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Mon, May 16, 2011 at 10:00:30AM -0600, Eric Blake wrote:
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is forever out of date. By annotating the driver struct tables in each driver with version information, we can auto-generate the hvsupport.html.in file. Annotating the drivers will be mandatory for new patches, ensuring hvsupport.html.in is never out of date again.
* docs/hvsupport.html.in: Delete * hvsupport.pl: Script to generate hvsupport.html.in * Makefile.am: Autogenerate hvsupport.html.in --- docs/Makefile.am | 10 +- docs/hvsupport.html.in | 801 ------------------------------------------------ docs/hvsupport.pl | 353 +++++++++++++++++++++ 3 files changed, 360 insertions(+), 804 deletions(-) delete mode 100644 docs/hvsupport.html.in create mode 100644 docs/hvsupport.pl
Hmm, that should probably be mode 100755, since it is an executable script. I'm pushing that obvious fix.
It doesn't hugely matter, since the makefile.am explicitly calls '$(PERL) hvsupport.pl' Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On 05/16/2011 10:11 AM, Daniel P. Berrange wrote:
On Mon, May 16, 2011 at 10:00:30AM -0600, Eric Blake wrote:
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is forever out of date. By annotating the driver struct tables in each driver with version information, we can auto-generate the hvsupport.html.in file. Annotating the drivers will be mandatory for new patches, ensuring hvsupport.html.in is never out of date again.
* docs/hvsupport.html.in: Delete * hvsupport.pl: Script to generate hvsupport.html.in * Makefile.am: Autogenerate hvsupport.html.in --- docs/Makefile.am | 10 +- docs/hvsupport.html.in | 801 ------------------------------------------------ docs/hvsupport.pl | 353 +++++++++++++++++++++ 3 files changed, 360 insertions(+), 804 deletions(-) delete mode 100644 docs/hvsupport.html.in create mode 100644 docs/hvsupport.pl
Hmm, that should probably be mode 100755, since it is an executable script. I'm pushing that obvious fix.
It doesn't hugely matter, since the makefile.am explicitly calls '$(PERL) hvsupport.pl'
True, but we might as well be consistent: -rwxrwxr-x. 1 dummy dummy 45492 May 12 09:56 ./daemon/remote_generator.pl* -rw-rw-r--. 1 dummy dummy 9521 May 16 09:23 ./docs/hvsupport.pl -rwxrwxr-x. 1 dummy dummy 3290 Mar 14 14:36 ./docs/todo.pl* -rw-rw-r--. 1 dummy dummy 3083 May 9 10:14 ./src/remote/rpcgen_fix.pl -rw-rw-r--. 1 dummy dummy 688 Nov 1 2010 ./tests/oomtrace.pl Before-hand, 2 out of 5 had the bit set; yet tests/oomtrace.pl is _not_ invoked via $(PERL) in tests/Makefile.am. So now all 5 scripts have the bit set. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
* src/remote/rpcgen_fix.pl: Add executable bit. * tests/oomtrace.pl: Likewise. --- I found a couple other files that could also use this treatment. Pushing under the trivial rule. 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/remote/rpcgen_fix.pl mode change 100644 => 100755 tests/oomtrace.pl diff --git a/src/remote/rpcgen_fix.pl b/src/remote/rpcgen_fix.pl old mode 100644 new mode 100755 diff --git a/tests/oomtrace.pl b/tests/oomtrace.pl old mode 100644 new mode 100755 -- 1.7.4.4
Add many version number annotations to the internal driver tables, to allow hvsupport.html to display more accurate information --- src/esx/esx_driver.c | 70 ++++++------ src/interface/netcf_driver.c | 28 ++-- src/libxl/libxl_driver.c | 102 ++++++++-------- src/lxc/lxc_driver.c | 28 ++-- src/network/bridge_driver.c | 38 +++--- src/nwfilter/nwfilter_driver.c | 18 ++-- src/openvz/openvz_driver.c | 30 +++--- src/phyp/phyp_driver.c | 24 ++-- src/qemu/qemu_driver.c | 62 +++++----- src/remote/remote_driver.c | 256 ++++++++++++++++++++-------------------- src/secret/secret_driver.c | 22 ++-- src/storage/storage_driver.c | 80 ++++++------ src/test/test_driver.c | 32 +++--- src/uml/uml_driver.c | 62 +++++----- src/vbox/vbox_tmpl.c | 60 +++++----- src/vmware/vmware_driver.c | 52 ++++---- src/xen/xen_driver.c | 92 +++++++------- src/xenapi/xenapi_driver.c | 78 ++++++------ 18 files changed, 567 insertions(+), 567 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 4c9bed2..cb5330e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4591,52 +4591,52 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params, static virDriver esxDriver = { VIR_DRV_ESX, "ESX", - .open = esxOpen, - .close = esxClose, - .supports_feature = esxSupportsFeature, - .type = esxGetType, - .version = esxGetVersion, - .getHostname = esxGetHostname, - .nodeGetInfo = esxNodeGetInfo, + .open = esxOpen, /* 0.7.0 */ + .close = esxClose, /* 0.7.0 */ + .supports_feature = esxSupportsFeature, /* 0.7.0 */ + .type = esxGetType, /* 0.7.0 */ + .version = esxGetVersion, /* 0.7.0 */ + .getHostname = esxGetHostname, /* 0.7.0 */ + .nodeGetInfo = esxNodeGetInfo, /* 0.7.0 */ .getCapabilities = esxGetCapabilities, - .listDomains = esxListDomains, - .numOfDomains = esxNumberOfDomains, - .domainLookupByID = esxDomainLookupByID, - .domainLookupByUUID = esxDomainLookupByUUID, - .domainLookupByName = esxDomainLookupByName, - .domainSuspend = esxDomainSuspend, - .domainResume = esxDomainResume, - .domainShutdown = esxDomainShutdown, - .domainReboot = esxDomainReboot, - .domainDestroy = esxDomainDestroy, - .domainGetOSType = esxDomainGetOSType, - .domainGetMaxMemory = esxDomainGetMaxMemory, - .domainSetMaxMemory = esxDomainSetMaxMemory, - .domainSetMemory = esxDomainSetMemory, + .listDomains = esxListDomains, /* 0.7.0 */ + .numOfDomains = esxNumberOfDomains, /* 0.7.0 */ + .domainLookupByID = esxDomainLookupByID, /* 0.7.0 */ + .domainLookupByUUID = esxDomainLookupByUUID, /* 0.7.0 */ + .domainLookupByName = esxDomainLookupByName, /* 0.7.0 */ + .domainSuspend = esxDomainSuspend, /* 0.7.0 */ + .domainResume = esxDomainResume, /* 0.7.0 */ + .domainShutdown = esxDomainShutdown, /* 0.7.0 */ + .domainReboot = esxDomainReboot, /* 0.7.0 */ + .domainDestroy = esxDomainDestroy, /* 0.7.0 */ + .domainGetOSType = esxDomainGetOSType, /* 0.7.0 */ + .domainGetMaxMemory = esxDomainGetMaxMemory, /* 0.7.0 */ + .domainSetMaxMemory = esxDomainSetMaxMemory, /* 0.7.0 */ + .domainSetMemory = esxDomainSetMemory, /* 0.7.0 */ .domainSetMemoryParameters = esxDomainSetMemoryParameters, .domainGetMemoryParameters = esxDomainGetMemoryParameters, - .domainGetInfo = esxDomainGetInfo, - .domainSetVcpus = esxDomainSetVcpus, + .domainGetInfo = esxDomainGetInfo, /* 0.7.0 */ + .domainSetVcpus = esxDomainSetVcpus, /* 0.7.0 */ .domainSetVcpusFlags = esxDomainSetVcpusFlags, .domainGetVcpusFlags = esxDomainGetVcpusFlags, - .domainGetMaxVcpus = esxDomainGetMaxVcpus, - .domainGetXMLDesc = esxDomainGetXMLDesc, - .domainXMLFromNative = esxDomainXMLFromNative, + .domainGetMaxVcpus = esxDomainGetMaxVcpus, /* 0.7.0 */ + .domainGetXMLDesc = esxDomainGetXMLDesc, /* 0.7.0 */ + .domainXMLFromNative = esxDomainXMLFromNative, /* 0.7.0 */ .domainXMLToNative = esxDomainXMLToNative, - .listDefinedDomains = esxListDefinedDomains, - .numOfDefinedDomains = esxNumberOfDefinedDomains, - .domainCreate = esxDomainCreate, + .listDefinedDomains = esxListDefinedDomains, /* 0.7.0 */ + .numOfDefinedDomains = esxNumberOfDefinedDomains, /* 0.7.0 */ + .domainCreate = esxDomainCreate, /* 0.7.0 */ .domainCreateWithFlags = esxDomainCreateWithFlags, .domainDefineXML = esxDomainDefineXML, .domainUndefine = esxDomainUndefine, .domainGetAutostart = esxDomainGetAutostart, .domainSetAutostart = esxDomainSetAutostart, - .domainGetSchedulerType = esxDomainGetSchedulerType, - .domainGetSchedulerParameters = esxDomainGetSchedulerParameters, - .domainSetSchedulerParameters = esxDomainSetSchedulerParameters, - .domainMigratePrepare = esxDomainMigratePrepare, - .domainMigratePerform = esxDomainMigratePerform, - .domainMigrateFinish = esxDomainMigrateFinish, + .domainGetSchedulerType = esxDomainGetSchedulerType, /* 0.7.0 */ + .domainGetSchedulerParameters = esxDomainGetSchedulerParameters, /* 0.7.0 */ + .domainSetSchedulerParameters = esxDomainSetSchedulerParameters, /* 0.7.0 */ + .domainMigratePrepare = esxDomainMigratePrepare, /* 0.7.0 */ + .domainMigratePerform = esxDomainMigratePerform, /* 0.7.0 */ + .domainMigrateFinish = esxDomainMigrateFinish, /* 0.7.0 */ .nodeGetFreeMemory = esxNodeGetFreeMemory, .isEncrypted = esxIsEncrypted, .isSecure = esxIsSecure, diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 74b9638..d5b401a 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -542,20 +542,20 @@ cleanup: static virInterfaceDriver interfaceDriver = { "Interface", - .open = interfaceOpenInterface, - .close = interfaceCloseInterface, - .numOfInterfaces = interfaceNumOfInterfaces, - .listInterfaces = interfaceListInterfaces, - .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, - .listDefinedInterfaces = interfaceListDefinedInterfaces, - .interfaceLookupByName = interfaceLookupByName, - .interfaceLookupByMACString = interfaceLookupByMACString, - .interfaceGetXMLDesc = interfaceGetXMLDesc, - .interfaceDefineXML = interfaceDefineXML, - .interfaceUndefine = interfaceUndefine, - .interfaceCreate = interfaceCreate, - .interfaceDestroy = interfaceDestroy, - .interfaceIsActive = interfaceIsActive, + .open = interfaceOpenInterface, /* 0.7.0 */ + .close = interfaceCloseInterface, /* 0.7.0 */ + .numOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ + .listInterfaces = interfaceListInterfaces, /* 0.7.0 */ + .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ + .listDefinedInterfaces = interfaceListDefinedInterfaces, /* 0.7.0 */ + .interfaceLookupByName = interfaceLookupByName, /* 0.7.0 */ + .interfaceLookupByMACString = interfaceLookupByMACString, /* 0.7.0 */ + .interfaceGetXMLDesc = interfaceGetXMLDesc, /* 0.7.0 */ + .interfaceDefineXML = interfaceDefineXML, /* 0.7.0 */ + .interfaceUndefine = interfaceUndefine, /* 0.7.0 */ + .interfaceCreate = interfaceCreate, /* 0.7.0 */ + .interfaceDestroy = interfaceDestroy, /* 0.7.0 */ + .interfaceIsActive = interfaceIsActive, /* 0.7.3 */ }; int interfaceRegister(void) { diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bc54e3e..1d91276 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2681,57 +2681,57 @@ libxlDomainEventDeregisterAny(virConnectPtr conn, int callbackID) static virDriver libxlDriver = { VIR_DRV_LIBXL, "xenlight", - .open = libxlOpen, - .close = libxlClose, - .type = libxlGetType, - .version = libxlGetVersion, - .getHostname = virGetHostname, - .getMaxVcpus = libxlGetMaxVcpus, - .nodeGetInfo = libxlNodeGetInfo, - .getCapabilities = libxlGetCapabilities, - .listDomains = libxlListDomains, - .numOfDomains = libxlNumDomains, - .domainCreateXML = libxlDomainCreateXML, - .domainLookupByID = libxlDomainLookupByID, - .domainLookupByUUID = libxlDomainLookupByUUID, - .domainLookupByName = libxlDomainLookupByName, - .domainSuspend = libxlDomainSuspend, - .domainResume = libxlDomainResume, - .domainShutdown = libxlDomainShutdown, - .domainReboot = libxlDomainReboot, - .domainDestroy = libxlDomainDestroy, - .domainGetOSType = libxlDomainGetOSType, - .domainGetMaxMemory = libxlDomainGetMaxMemory, - .domainSetMemory = libxlDomainSetMemory, - .domainSetMemoryFlags = libxlDomainSetMemoryFlags, - .domainGetInfo = libxlDomainGetInfo, - .domainSetVcpus = libxlDomainSetVcpus, - .domainSetVcpusFlags = libxlDomainSetVcpusFlags, - .domainGetVcpusFlags = libxlDomainGetVcpusFlags, - .domainPinVcpu = libxlDomainPinVcpu, - .domainGetVcpus = libxlDomainGetVcpus, - .domainGetXMLDesc = libxlDomainGetXMLDesc, - .domainXMLFromNative = libxlDomainXMLFromNative, - .domainXMLToNative = libxlDomainXMLToNative, - .listDefinedDomains = libxlListDefinedDomains, - .numOfDefinedDomains = libxlNumDefinedDomains, - .domainCreate = libxlDomainCreate, - .domainCreateWithFlags = libxlDomainCreateWithFlags, - .domainDefineXML = libxlDomainDefineXML, - .domainUndefine = libxlDomainUndefine, - .domainGetAutostart = libxlDomainGetAutostart, - .domainSetAutostart = libxlDomainSetAutostart, - .domainGetSchedulerType = libxlDomainGetSchedulerType, - .domainGetSchedulerParameters = libxlDomainGetSchedulerParameters, - .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, - .nodeGetFreeMemory = libxlNodeGetFreeMemory, - .domainEventRegister = libxlDomainEventRegister, - .domainEventDeregister = libxlDomainEventDeregister, - .domainIsActive = libxlDomainIsActive, - .domainIsPersistent = libxlDomainIsPersistent, - .domainIsUpdated = libxlDomainIsUpdated, - .domainEventRegisterAny = libxlDomainEventRegisterAny, - .domainEventDeregisterAny = libxlDomainEventDeregisterAny, + .open = libxlOpen, /* 0.9.0 */ + .close = libxlClose, /* 0.9.0 */ + .type = libxlGetType, /* 0.9.0 */ + .version = libxlGetVersion, /* 0.9.0 */ + .getHostname = virGetHostname, /* 0.9.0 */ + .getMaxVcpus = libxlGetMaxVcpus, /* 0.9.0 */ + .nodeGetInfo = libxlNodeGetInfo, /* 0.9.0 */ + .getCapabilities = libxlGetCapabilities, /* 0.9.0 */ + .listDomains = libxlListDomains, /* 0.9.0 */ + .numOfDomains = libxlNumDomains, /* 0.9.0 */ + .domainCreateXML = libxlDomainCreateXML, /* 0.9.0 */ + .domainLookupByID = libxlDomainLookupByID, /* 0.9.0 */ + .domainLookupByUUID = libxlDomainLookupByUUID, /* 0.9.0 */ + .domainLookupByName = libxlDomainLookupByName, /* 0.9.0 */ + .domainSuspend = libxlDomainSuspend, /* 0.9.0 */ + .domainResume = libxlDomainResume, /* 0.9.0 */ + .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ + .domainReboot = libxlDomainReboot, /* 0.9.0 */ + .domainDestroy = libxlDomainDestroy, /* 0.9.0 */ + .domainGetOSType = libxlDomainGetOSType, /* 0.9.0 */ + .domainGetMaxMemory = libxlDomainGetMaxMemory, /* 0.9.0 */ + .domainSetMemory = libxlDomainSetMemory, /* 0.9.0 */ + .domainSetMemoryFlags = libxlDomainSetMemoryFlags, /* 0.9.0 */ + .domainGetInfo = libxlDomainGetInfo, /* 0.9.0 */ + .domainSetVcpus = libxlDomainSetVcpus, /* 0.9.0 */ + .domainSetVcpusFlags = libxlDomainSetVcpusFlags, /* 0.9.0 */ + .domainGetVcpusFlags = libxlDomainGetVcpusFlags, /* 0.9.0 */ + .domainPinVcpu = libxlDomainPinVcpu, /* 0.9.0 */ + .domainGetVcpus = libxlDomainGetVcpus, /* 0.9.0 */ + .domainGetXMLDesc = libxlDomainGetXMLDesc, /* 0.9.0 */ + .domainXMLFromNative = libxlDomainXMLFromNative, /* 0.9.0 */ + .domainXMLToNative = libxlDomainXMLToNative, /* 0.9.0 */ + .listDefinedDomains = libxlListDefinedDomains, /* 0.9.0 */ + .numOfDefinedDomains = libxlNumDefinedDomains, /* 0.9.0 */ + .domainCreate = libxlDomainCreate, /* 0.9.0 */ + .domainCreateWithFlags = libxlDomainCreateWithFlags, /* 0.9.0 */ + .domainDefineXML = libxlDomainDefineXML, /* 0.9.0 */ + .domainUndefine = libxlDomainUndefine, /* 0.9.0 */ + .domainGetAutostart = libxlDomainGetAutostart, /* 0.9.0 */ + .domainSetAutostart = libxlDomainSetAutostart, /* 0.9.0 */ + .domainGetSchedulerType = libxlDomainGetSchedulerType, /* 0.9.0 */ + .domainGetSchedulerParameters = libxlDomainGetSchedulerParameters, /* 0.9.0 */ + .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */ + .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ + .domainEventRegister = libxlDomainEventRegister, /* 0.9.0 */ + .domainEventDeregister = libxlDomainEventDeregister, /* 0.9.0 */ + .domainIsActive = libxlDomainIsActive, /* 0.9.0 */ + .domainIsPersistent = libxlDomainIsPersistent, /* 0.9.0 */ + .domainIsUpdated = libxlDomainIsUpdated, /* 0.9.0 */ + .domainEventRegisterAny = libxlDomainEventRegisterAny, /* 0.9.0 */ + .domainEventDeregisterAny = libxlDomainEventDeregisterAny, /* 0.9.0 */ }; static virStateDriver libxlStateDriver = { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 1346336..5101dfd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2708,35 +2708,35 @@ cleanup: static virDriver lxcDriver = { VIR_DRV_LXC, "LXC", - .open = lxcOpen, - .close = lxcClose, + .open = lxcOpen, /* 0.4.2 */ + .close = lxcClose, /* 0.4.2 */ .version = lxcVersion, .getHostname = virGetHostname, .nodeGetInfo = nodeGetInfo, .getCapabilities = lxcGetCapabilities, - .listDomains = lxcListDomains, - .numOfDomains = lxcNumDomains, + .listDomains = lxcListDomains, /* 0.4.2 */ + .numOfDomains = lxcNumDomains, /* 0.4.2 */ .domainCreateXML = lxcDomainCreateAndStart, - .domainLookupByID = lxcDomainLookupByID, - .domainLookupByUUID = lxcDomainLookupByUUID, - .domainLookupByName = lxcDomainLookupByName, + .domainLookupByID = lxcDomainLookupByID, /* 0.4.2 */ + .domainLookupByUUID = lxcDomainLookupByUUID, /* 0.4.2 */ + .domainLookupByName = lxcDomainLookupByName, /* 0.4.2 */ .domainSuspend = lxcDomainSuspend, .domainResume = lxcDomainResume, .domainDestroy = lxcDomainDestroy, - .domainGetOSType = lxcGetOSType, + .domainGetOSType = lxcGetOSType, /* 0.4.2 */ .domainGetMaxMemory = lxcDomainGetMaxMemory, .domainSetMaxMemory = lxcDomainSetMaxMemory, .domainSetMemory = lxcDomainSetMemory, .domainSetMemoryParameters = lxcDomainSetMemoryParameters, .domainGetMemoryParameters = lxcDomainGetMemoryParameters, - .domainGetInfo = lxcDomainGetInfo, - .domainGetXMLDesc = lxcDomainGetXMLDesc, - .listDefinedDomains = lxcListDefinedDomains, - .numOfDefinedDomains = lxcNumDefinedDomains, + .domainGetInfo = lxcDomainGetInfo, /* 0.4.2 */ + .domainGetXMLDesc = lxcDomainGetXMLDesc, /* 0.4.2 */ + .listDefinedDomains = lxcListDefinedDomains, /* 0.4.2 */ + .numOfDefinedDomains = lxcNumDefinedDomains, /* 0.4.2 */ .domainCreate = lxcDomainStart, .domainCreateWithFlags = lxcDomainStartWithFlags, - .domainDefineXML = lxcDomainDefine, - .domainUndefine = lxcDomainUndefine, + .domainDefineXML = lxcDomainDefine, /* 0.4.2 */ + .domainUndefine = lxcDomainUndefine, /* 0.4.2 */ .domainGetAutostart = lxcDomainGetAutostart, .domainSetAutostart = lxcDomainSetAutostart, .domainGetSchedulerType = lxcGetSchedulerType, diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 00f32ad..5e4b4d9 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2504,25 +2504,25 @@ cleanup: static virNetworkDriver networkDriver = { "Network", - .open = networkOpenNetwork, - .close = networkCloseNetwork, - .numOfNetworks = networkNumNetworks, - .listNetworks = networkListNetworks, - .numOfDefinedNetworks = networkNumDefinedNetworks, - .listDefinedNetworks = networkListDefinedNetworks, - .networkLookupByUUID = networkLookupByUUID, - .networkLookupByName = networkLookupByName, - .networkCreateXML = networkCreate, - .networkDefineXML = networkDefine, - .networkUndefine = networkUndefine, - .networkCreate = networkStart, - .networkDestroy = networkDestroy, - .networkGetXMLDesc = networkGetXMLDesc, - .networkGetBridgeName = networkGetBridgeName, - .networkGetAutostart = networkGetAutostart, - .networkSetAutostart = networkSetAutostart, - networkIsActive, - networkIsPersistent, + .open = networkOpenNetwork, /* 0.2.0 */ + .close = networkCloseNetwork, /* 0.2.0 */ + .numOfNetworks = networkNumNetworks, /* 0.2.0 */ + .listNetworks = networkListNetworks, /* 0.2.0 */ + .numOfDefinedNetworks = networkNumDefinedNetworks, /* 0.2.0 */ + .listDefinedNetworks = networkListDefinedNetworks, /* 0.2.0 */ + .networkLookupByUUID = networkLookupByUUID, /* 0.2.0 */ + .networkLookupByName = networkLookupByName, /* 0.2.0 */ + .networkCreateXML = networkCreate, /* 0.2.0 */ + .networkDefineXML = networkDefine, /* 0.2.0 */ + .networkUndefine = networkUndefine, /* 0.2.0 */ + .networkCreate = networkStart, /* 0.2.0 */ + .networkDestroy = networkDestroy, /* 0.2.0 */ + .networkGetXMLDesc = networkGetXMLDesc, /* 0.2.0 */ + .networkGetBridgeName = networkGetBridgeName, /* 0.2.0 */ + .networkGetAutostart = networkGetAutostart, /* 0.2.1 */ + .networkSetAutostart = networkSetAutostart, /* 0.2.1 */ + .networkIsActive = networkIsActive, /* 0.7.3 */ + .networkIsPersistent = networkIsPersistent, /* 0.7.3 */ }; static virStateDriver networkStateDriver = { diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 18ea752..db3d789 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -449,15 +449,15 @@ nwfilterTeardownFilter(virDomainNetDefPtr net) { static virNWFilterDriver nwfilterDriver = { .name = "nwfilter", - .open = nwfilterOpen, - .close = nwfilterClose, - .numOfNWFilters = nwfilterNumNWFilters, - .listNWFilters = nwfilterListNWFilters, - .nwfilterLookupByName = nwfilterLookupByName, - .nwfilterLookupByUUID = nwfilterLookupByUUID, - .defineXML = nwfilterDefine, - .undefine = nwfilterUndefine, - .getXMLDesc = nwfilterGetXMLDesc, + .open = nwfilterOpen, /* 0.8.0 */ + .close = nwfilterClose, /* 0.8.0 */ + .numOfNWFilters = nwfilterNumNWFilters, /* 0.8.0 */ + .listNWFilters = nwfilterListNWFilters, /* 0.8.0 */ + .nwfilterLookupByName = nwfilterLookupByName, /* 0.8.0 */ + .nwfilterLookupByUUID = nwfilterLookupByUUID, /* 0.8.0 */ + .defineXML = nwfilterDefine, /* 0.8.0 */ + .undefine = nwfilterUndefine, /* 0.8.0 */ + .getXMLDesc = nwfilterGetXMLDesc, /* 0.8.0 */ }; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index cac5d17..7cac0fc 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1559,33 +1559,33 @@ cleanup: static virDriver openvzDriver = { VIR_DRV_OPENVZ, "OPENVZ", - .open = openvzOpen, - .close = openvzClose, - .type = openvzGetType, + .open = openvzOpen, /* 0.3.1 */ + .close = openvzClose, /* 0.3.1 */ + .type = openvzGetType, /* 0.3.1 */ .version = openvzGetVersion, .getMaxVcpus = openvzGetMaxVCPUs, .nodeGetInfo = nodeGetInfo, .getCapabilities = openvzGetCapabilities, - .listDomains = openvzListDomains, - .numOfDomains = openvzNumDomains, + .listDomains = openvzListDomains, /* 0.3.1 */ + .numOfDomains = openvzNumDomains, /* 0.3.1 */ .domainCreateXML = openvzDomainCreateXML, - .domainLookupByID = openvzDomainLookupByID, - .domainLookupByUUID = openvzDomainLookupByUUID, - .domainLookupByName = openvzDomainLookupByName, + .domainLookupByID = openvzDomainLookupByID, /* 0.3.1 */ + .domainLookupByUUID = openvzDomainLookupByUUID, /* 0.3.1 */ + .domainLookupByName = openvzDomainLookupByName, /* 0.3.1 */ .domainSuspend = openvzDomainSuspend, .domainResume = openvzDomainResume, - .domainShutdown = openvzDomainShutdown, - .domainReboot = openvzDomainReboot, - .domainDestroy = openvzDomainShutdown, - .domainGetOSType = openvzGetOSType, - .domainGetInfo = openvzDomainGetInfo, + .domainShutdown = openvzDomainShutdown, /* 0.3.1 */ + .domainReboot = openvzDomainReboot, /* 0.3.1 */ + .domainDestroy = openvzDomainShutdown, /* 0.3.1 */ + .domainGetOSType = openvzGetOSType, /* 0.3.1 */ + .domainGetInfo = openvzDomainGetInfo, /* 0.3.1 */ .domainSetVcpus = openvzDomainSetVcpus, .domainSetVcpusFlags = openvzDomainSetVcpusFlags, .domainGetVcpusFlags = openvzDomainGetVcpusFlags, .domainGetMaxVcpus = openvzDomainGetMaxVcpus, .domainGetXMLDesc = openvzDomainGetXMLDesc, - .listDefinedDomains = openvzListDefinedDomains, - .numOfDefinedDomains = openvzNumDefinedDomains, + .listDefinedDomains = openvzListDefinedDomains, /* 0.3.1 */ + .numOfDefinedDomains = openvzNumDefinedDomains, /* 0.3.1 */ .domainCreate = openvzDomainCreate, .domainCreateWithFlags = openvzDomainCreateWithFlags, .domainDefineXML = openvzDomainDefineXML, diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index e147495..3c22e12 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3722,26 +3722,26 @@ phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virDriver phypDriver = { VIR_DRV_PHYP, "PHYP", - .open = phypOpen, - .close = phypClose, + .open = phypOpen, /* 0.7.0 */ + .close = phypClose, /* 0.7.0 */ .getCapabilities = phypConnectGetCapabilities, - .listDomains = phypListDomains, - .numOfDomains = phypNumDomains, + .listDomains = phypListDomains, /* 0.7.0 */ + .numOfDomains = phypNumDomains, /* 0.7.0 */ .domainCreateXML = phypDomainCreateAndStart, - .domainLookupByID = phypDomainLookupByID, - .domainLookupByName = phypDomainLookupByName, - .domainResume = phypDomainResume, - .domainShutdown = phypDomainShutdown, + .domainLookupByID = phypDomainLookupByID, /* 0.7.0 */ + .domainLookupByName = phypDomainLookupByName, /* 0.7.0 */ + .domainResume = phypDomainResume, /* 0.7.0 */ + .domainShutdown = phypDomainShutdown, /* 0.7.0 */ .domainReboot = phypDomainReboot, .domainDestroy = phypDomainDestroy, - .domainGetInfo = phypDomainGetInfo, + .domainGetInfo = phypDomainGetInfo, /* 0.7.0 */ .domainSetVcpus = phypDomainSetCPU, .domainSetVcpusFlags = phypDomainSetVcpusFlags, .domainGetVcpusFlags = phypDomainGetVcpusFlags, .domainGetMaxVcpus = phypGetLparCPUMAX, - .domainGetXMLDesc = phypDomainGetXMLDesc, - .listDefinedDomains = phypListDefinedDomains, - .numOfDefinedDomains = phypNumDefinedDomains, + .domainGetXMLDesc = phypDomainGetXMLDesc, /* 0.7.0 */ + .listDefinedDomains = phypListDefinedDomains, /* 0.7.0 */ + .numOfDefinedDomains = phypNumDefinedDomains, /* 0.7.0 */ .domainAttachDevice = phypAttachDevice, .isEncrypted = phypIsEncrypted, .isSecure = phypIsSecure, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9156b79..34b80a1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7224,26 +7224,26 @@ cleanup: static virDriver qemuDriver = { VIR_DRV_QEMU, "QEMU", - .open = qemudOpen, - .close = qemudClose, - .supports_feature = qemudSupportsFeature, - .type = qemudGetType, - .version = qemudGetVersion, - .getHostname = virGetHostname, - .getSysinfo = qemuGetSysinfo, - .getMaxVcpus = qemudGetMaxVCPUs, - .nodeGetInfo = nodeGetInfo, + .open = qemudOpen, /* 0.2.0 */ + .close = qemudClose, /* 0.2.0 */ + .supports_feature = qemudSupportsFeature, /* 0.2.0 */ + .type = qemudGetType, /* 0.2.0 */ + .version = qemudGetVersion, /* 0.2.0 */ + .getHostname = virGetHostname, /* 0.3.0 */ + .getSysinfo = qemuGetSysinfo, /* 0.8.8 */ + .getMaxVcpus = qemudGetMaxVCPUs, /* 0.2.1 */ + .nodeGetInfo = nodeGetInfo, /* 0.2.0 */ .getCapabilities = qemudGetCapabilities, - .listDomains = qemudListDomains, - .numOfDomains = qemudNumDomains, - .domainCreateXML = qemudDomainCreate, - .domainLookupByID = qemudDomainLookupByID, - .domainLookupByUUID = qemudDomainLookupByUUID, - .domainLookupByName = qemudDomainLookupByName, - .domainSuspend = qemudDomainSuspend, - .domainResume = qemudDomainResume, - .domainShutdown = qemudDomainShutdown, - .domainDestroy = qemudDomainDestroy, + .listDomains = qemudListDomains, /* 0.2.0 */ + .numOfDomains = qemudNumDomains, /* 0.2.0 */ + .domainCreateXML = qemudDomainCreate, /* 0.2.0 */ + .domainLookupByID = qemudDomainLookupByID, /* 0.2.0 */ + .domainLookupByUUID = qemudDomainLookupByUUID, /* 0.2.0 */ + .domainLookupByName = qemudDomainLookupByName, /* 0.2.0 */ + .domainSuspend = qemudDomainSuspend, /* 0.2.0 */ + .domainResume = qemudDomainResume, /* 0.2.0 */ + .domainShutdown = qemudDomainShutdown, /* 0.2.0 */ + .domainDestroy = qemudDomainDestroy, /* 0.2.0 */ .domainGetOSType = qemudDomainGetOSType, .domainGetMaxMemory = qemudDomainGetMaxMemory, .domainSetMaxMemory = qemudDomainSetMaxMemory, @@ -7253,9 +7253,9 @@ static virDriver qemuDriver = { .domainGetMemoryParameters = qemuDomainGetMemoryParameters, .domainSetBlkioParameters = qemuDomainSetBlkioParameters, .domainGetBlkioParameters = qemuDomainGetBlkioParameters, - .domainGetInfo = qemudDomainGetInfo, - .domainSave = qemudDomainSave, - .domainRestore = qemuDomainRestore, + .domainGetInfo = qemudDomainGetInfo, /* 0.2.0 */ + .domainSave = qemudDomainSave, /* 0.2.0 */ + .domainRestore = qemuDomainRestore, /* 0.2.0 */ .domainCoreDump = qemudDomainCoreDump, .domainScreenshot = qemuDomainScreenshot, .domainSetVcpus = qemudDomainSetVcpus, @@ -7263,25 +7263,25 @@ static virDriver qemuDriver = { .domainGetVcpusFlags = qemudDomainGetVcpusFlags, .domainPinVcpu = qemudDomainPinVcpu, .domainGetVcpus = qemudDomainGetVcpus, - .domainGetMaxVcpus = qemudDomainGetMaxVcpus, + .domainGetMaxVcpus = qemudDomainGetMaxVcpus, /* 0.2.0 */ .domainGetSecurityLabel = qemudDomainGetSecurityLabel, .nodeGetSecurityModel = qemudNodeGetSecurityModel, - .domainGetXMLDesc = qemuDomainGetXMLDesc, + .domainGetXMLDesc = qemuDomainGetXMLDesc, /* 0.2.0 */ .domainXMLFromNative = qemuDomainXMLFromNative, .domainXMLToNative = qemuDomainXMLToNative, - .listDefinedDomains = qemudListDefinedDomains, - .numOfDefinedDomains = qemudNumDefinedDomains, - .domainCreate = qemudDomainStart, + .listDefinedDomains = qemudListDefinedDomains, /* 0.2.0 */ + .numOfDefinedDomains = qemudNumDefinedDomains, /* 0.2.0 */ + .domainCreate = qemudDomainStart, /* 0.2.0 */ .domainCreateWithFlags = qemudDomainStartWithFlags, - .domainDefineXML = qemudDomainDefine, - .domainUndefine = qemudDomainUndefine, + .domainDefineXML = qemudDomainDefine, /* 0.2.0 */ + .domainUndefine = qemudDomainUndefine, /* 0.2.0 */ .domainAttachDevice = qemuDomainAttachDevice, .domainAttachDeviceFlags = qemuDomainAttachDeviceFlags, .domainDetachDevice = qemuDomainDetachDevice, .domainDetachDeviceFlags = qemuDomainDetachDeviceFlags, .domainUpdateDeviceFlags = qemuDomainUpdateDeviceFlags, - .domainGetAutostart = qemudDomainGetAutostart, - .domainSetAutostart = qemudDomainSetAutostart, + .domainGetAutostart = qemudDomainGetAutostart, /* 0.2.1 */ + .domainSetAutostart = qemudDomainSetAutostart, /* 0.2.1 */ .domainGetSchedulerType = qemuGetSchedulerType, .domainGetSchedulerParameters = qemuGetSchedulerParameters, .domainSetSchedulerParameters = qemuSetSchedulerParameters, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 09c1491..86a3537 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6430,69 +6430,69 @@ unsigned long remoteVersion(void) static virDriver remote_driver = { VIR_DRV_REMOTE, "remote", - .open = remoteOpen, - .close = remoteClose, - .supports_feature = remoteSupportsFeature, - .type = remoteType, - .version = remoteGetVersion, + .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, - .getHostname = remoteGetHostname, + .getHostname = remoteGetHostname, /* 0.3.0 */ .getSysinfo = remoteGetSysinfo, - .getMaxVcpus = remoteGetMaxVcpus, - .nodeGetInfo = remoteNodeGetInfo, - .getCapabilities = remoteGetCapabilities, - .listDomains = remoteListDomains, - .numOfDomains = remoteNumOfDomains, - .domainCreateXML = remoteDomainCreateXML, - .domainLookupByID = remoteDomainLookupByID, - .domainLookupByUUID = remoteDomainLookupByUUID, - .domainLookupByName = remoteDomainLookupByName, - .domainSuspend = remoteDomainSuspend, - .domainResume = remoteDomainResume, - .domainShutdown = remoteDomainShutdown, - .domainReboot = remoteDomainReboot, - .domainDestroy = remoteDomainDestroy, - .domainGetOSType = remoteDomainGetOSType, - .domainGetMaxMemory = remoteDomainGetMaxMemory, - .domainSetMaxMemory = remoteDomainSetMaxMemory, - .domainSetMemory = remoteDomainSetMemory, + .getMaxVcpus = remoteGetMaxVcpus, /* 0.3.0 */ + .nodeGetInfo = remoteNodeGetInfo, /* 0.3.0 */ + .getCapabilities = remoteGetCapabilities, /* 0.3.0 */ + .listDomains = remoteListDomains, /* 0.3.0 */ + .numOfDomains = remoteNumOfDomains, /* 0.3.0 */ + .domainCreateXML = remoteDomainCreateXML, /* 0.3.0 */ + .domainLookupByID = remoteDomainLookupByID, /* 0.3.0 */ + .domainLookupByUUID = remoteDomainLookupByUUID, /* 0.3.0 */ + .domainLookupByName = remoteDomainLookupByName, /* 0.3.0 */ + .domainSuspend = remoteDomainSuspend, /* 0.3.0 */ + .domainResume = remoteDomainResume, /* 0.3.0 */ + .domainShutdown = remoteDomainShutdown, /* 0.3.0 */ + .domainReboot = remoteDomainReboot, /* 0.3.0 */ + .domainDestroy = remoteDomainDestroy, /* 0.3.0 */ + .domainGetOSType = remoteDomainGetOSType, /* 0.3.0 */ + .domainGetMaxMemory = remoteDomainGetMaxMemory, /* 0.3.0 */ + .domainSetMaxMemory = remoteDomainSetMaxMemory, /* 0.3.0 */ + .domainSetMemory = remoteDomainSetMemory, /* 0.3.0 */ .domainSetMemoryFlags = remoteDomainSetMemoryFlags, .domainSetMemoryParameters = remoteDomainSetMemoryParameters, .domainGetMemoryParameters = remoteDomainGetMemoryParameters, .domainSetBlkioParameters = remoteDomainSetBlkioParameters, .domainGetBlkioParameters = remoteDomainGetBlkioParameters, - .domainGetInfo = remoteDomainGetInfo, - .domainSave = remoteDomainSave, - .domainRestore = remoteDomainRestore, - .domainCoreDump = remoteDomainCoreDump, + .domainGetInfo = remoteDomainGetInfo, /* 0.3.0 */ + .domainSave = remoteDomainSave, /* 0.3.0 */ + .domainRestore = remoteDomainRestore, /* 0.3.0 */ + .domainCoreDump = remoteDomainCoreDump, /* 0.3.0 */ .domainScreenshot = remoteDomainScreenshot, - .domainSetVcpus = remoteDomainSetVcpus, + .domainSetVcpus = remoteDomainSetVcpus, /* 0.3.0 */ .domainSetVcpusFlags = remoteDomainSetVcpusFlags, .domainGetVcpusFlags = remoteDomainGetVcpusFlags, - .domainPinVcpu = remoteDomainPinVcpu, - .domainGetVcpus = remoteDomainGetVcpus, - .domainGetMaxVcpus = remoteDomainGetMaxVcpus, + .domainPinVcpu = remoteDomainPinVcpu, /* 0.3.0 */ + .domainGetVcpus = remoteDomainGetVcpus, /* 0.3.0 */ + .domainGetMaxVcpus = remoteDomainGetMaxVcpus, /* 0.3.0 */ .domainGetSecurityLabel = remoteDomainGetSecurityLabel, .nodeGetSecurityModel = remoteNodeGetSecurityModel, - .domainGetXMLDesc = remoteDomainGetXMLDesc, + .domainGetXMLDesc = remoteDomainGetXMLDesc, /* 0.3.0 */ .domainXMLFromNative = remoteDomainXMLFromNative, .domainXMLToNative = remoteDomainXMLToNative, - .listDefinedDomains = remoteListDefinedDomains, - .numOfDefinedDomains = remoteNumOfDefinedDomains, - .domainCreate = remoteDomainCreate, + .listDefinedDomains = remoteListDefinedDomains, /* 0.3.0 */ + .numOfDefinedDomains = remoteNumOfDefinedDomains, /* 0.3.0 */ + .domainCreate = remoteDomainCreate, /* 0.3.0 */ .domainCreateWithFlags = remoteDomainCreateWithFlags, - .domainDefineXML = remoteDomainDefineXML, - .domainUndefine = remoteDomainUndefine, - .domainAttachDevice = remoteDomainAttachDevice, + .domainDefineXML = remoteDomainDefineXML, /* 0.3.0 */ + .domainUndefine = remoteDomainUndefine, /* 0.3.0 */ + .domainAttachDevice = remoteDomainAttachDevice, /* 0.3.0 */ .domainAttachDeviceFlags = remoteDomainAttachDeviceFlags, - .domainDetachDevice = remoteDomainDetachDevice, + .domainDetachDevice = remoteDomainDetachDevice, /* 0.3.0 */ .domainDetachDeviceFlags = remoteDomainDetachDeviceFlags, .domainUpdateDeviceFlags = remoteDomainUpdateDeviceFlags, - .domainGetAutostart = remoteDomainGetAutostart, - .domainSetAutostart = remoteDomainSetAutostart, - .domainGetSchedulerType = remoteDomainGetSchedulerType, - .domainGetSchedulerParameters = remoteDomainGetSchedulerParameters, - .domainSetSchedulerParameters = remoteDomainSetSchedulerParameters, + .domainGetAutostart = remoteDomainGetAutostart, /* 0.3.0 */ + .domainSetAutostart = remoteDomainSetAutostart, /* 0.3.0 */ + .domainGetSchedulerType = remoteDomainGetSchedulerType, /* 0.3.0 */ + .domainGetSchedulerParameters = remoteDomainGetSchedulerParameters, /* 0.3.0 */ + .domainSetSchedulerParameters = remoteDomainSetSchedulerParameters, /* 0.3.0 */ .domainMigratePrepare = remoteDomainMigratePrepare, .domainMigratePerform = remoteDomainMigratePerform, .domainMigrateFinish = remoteDomainMigrateFinish, @@ -6512,11 +6512,11 @@ static virDriver remote_driver = { .nodeDeviceReAttach = remoteNodeDeviceReAttach, .nodeDeviceReset = remoteNodeDeviceReset, .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel, - .isEncrypted = remoteIsEncrypted, - .isSecure = remoteIsSecure, - .domainIsActive = remoteDomainIsActive, - .domainIsPersistent = remoteDomainIsPersistent, - .domainIsUpdated = remoteDomainIsUpdated, + .isEncrypted = remoteIsEncrypted, /* 0.7.3 */ + .isSecure = remoteIsSecure, /* 0.7.3 */ + .domainIsActive = remoteDomainIsActive, /* 0.7.3 */ + .domainIsPersistent = remoteDomainIsPersistent, /* 0.7.3 */ + .domainIsUpdated = remoteDomainIsUpdated, /* 0.8.6 */ .cpuCompare = remoteCPUCompare, .cpuBaseline = remoteCPUBaseline, .domainGetJobInfo = remoteDomainGetJobInfo, @@ -6544,101 +6544,101 @@ static virDriver remote_driver = { static virNetworkDriver network_driver = { .name = "remote", - .open = remoteNetworkOpen, - .close = remoteNetworkClose, - .numOfNetworks = remoteNumOfNetworks, - .listNetworks = remoteListNetworks, - .numOfDefinedNetworks = remoteNumOfDefinedNetworks, - .listDefinedNetworks = remoteListDefinedNetworks, - .networkLookupByUUID = remoteNetworkLookupByUUID, - .networkLookupByName = remoteNetworkLookupByName, - .networkCreateXML = remoteNetworkCreateXML, - .networkDefineXML = remoteNetworkDefineXML, - .networkUndefine = remoteNetworkUndefine, - .networkCreate = remoteNetworkCreate, - .networkDestroy = remoteNetworkDestroy, - .networkGetXMLDesc = remoteNetworkGetXMLDesc, - .networkGetBridgeName = remoteNetworkGetBridgeName, - .networkGetAutostart = remoteNetworkGetAutostart, - .networkSetAutostart = remoteNetworkSetAutostart, - .networkIsActive = remoteNetworkIsActive, - .networkIsPersistent = remoteNetworkIsPersistent, + .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 */ + .networkLookupByUUID = remoteNetworkLookupByUUID, /* 0.3.0 */ + .networkLookupByName = remoteNetworkLookupByName, /* 0.3.0 */ + .networkCreateXML = remoteNetworkCreateXML, /* 0.3.0 */ + .networkDefineXML = remoteNetworkDefineXML, /* 0.3.0 */ + .networkUndefine = remoteNetworkUndefine, /* 0.3.0 */ + .networkCreate = remoteNetworkCreate, /* 0.3.0 */ + .networkDestroy = remoteNetworkDestroy, /* 0.3.0 */ + .networkGetXMLDesc = remoteNetworkGetXMLDesc, /* 0.3.0 */ + .networkGetBridgeName = remoteNetworkGetBridgeName, /* 0.3.0 */ + .networkGetAutostart = remoteNetworkGetAutostart, /* 0.3.0 */ + .networkSetAutostart = remoteNetworkSetAutostart, /* 0.3.0 */ + .networkIsActive = remoteNetworkIsActive, /* 0.7.3 */ + .networkIsPersistent = remoteNetworkIsPersistent, /* 0.7.3 */ }; static virInterfaceDriver interface_driver = { .name = "remote", - .open = remoteInterfaceOpen, - .close = remoteInterfaceClose, - .numOfInterfaces = remoteNumOfInterfaces, - .listInterfaces = remoteListInterfaces, - .numOfDefinedInterfaces = remoteNumOfDefinedInterfaces, - .listDefinedInterfaces = remoteListDefinedInterfaces, - .interfaceLookupByName = remoteInterfaceLookupByName, - .interfaceLookupByMACString = remoteInterfaceLookupByMACString, - .interfaceGetXMLDesc = remoteInterfaceGetXMLDesc, - .interfaceDefineXML = remoteInterfaceDefineXML, - .interfaceUndefine = remoteInterfaceUndefine, - .interfaceCreate = remoteInterfaceCreate, - .interfaceDestroy = remoteInterfaceDestroy, - .interfaceIsActive = remoteInterfaceIsActive, + .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 */ + .interfaceLookupByName = remoteInterfaceLookupByName, /* 0.7.2 */ + .interfaceLookupByMACString = remoteInterfaceLookupByMACString, /* 0.7.2 */ + .interfaceGetXMLDesc = remoteInterfaceGetXMLDesc, /* 0.7.2 */ + .interfaceDefineXML = remoteInterfaceDefineXML, /* 0.7.2 */ + .interfaceUndefine = remoteInterfaceUndefine, /* 0.7.2 */ + .interfaceCreate = remoteInterfaceCreate, /* 0.7.2 */ + .interfaceDestroy = remoteInterfaceDestroy, /* 0.7.2 */ + .interfaceIsActive = remoteInterfaceIsActive, /* 0.7.3 */ }; static virStorageDriver storage_driver = { .name = "remote", - .open = remoteStorageOpen, - .close = remoteStorageClose, - .numOfPools = remoteNumOfStoragePools, - .listPools = remoteListStoragePools, - .numOfDefinedPools = remoteNumOfDefinedStoragePools, - .listDefinedPools = remoteListDefinedStoragePools, + .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 */ .findPoolSources = remoteFindStoragePoolSources, - .poolLookupByName = remoteStoragePoolLookupByName, - .poolLookupByUUID = remoteStoragePoolLookupByUUID, - .poolLookupByVolume = remoteStoragePoolLookupByVolume, - .poolCreateXML = remoteStoragePoolCreateXML, - .poolDefineXML = remoteStoragePoolDefineXML, - .poolBuild = remoteStoragePoolBuild, - .poolUndefine = remoteStoragePoolUndefine, - .poolCreate = remoteStoragePoolCreate, - .poolDestroy = remoteStoragePoolDestroy, - .poolDelete = remoteStoragePoolDelete, - .poolRefresh = remoteStoragePoolRefresh, - .poolGetInfo = remoteStoragePoolGetInfo, - .poolGetXMLDesc = remoteStoragePoolGetXMLDesc, - .poolGetAutostart = remoteStoragePoolGetAutostart, - .poolSetAutostart = remoteStoragePoolSetAutostart, - .poolNumOfVolumes = remoteStoragePoolNumOfVolumes, - .poolListVolumes = remoteStoragePoolListVolumes, - - .volLookupByName = remoteStorageVolLookupByName, - .volLookupByKey = remoteStorageVolLookupByKey, - .volLookupByPath = remoteStorageVolLookupByPath, - .volCreateXML = remoteStorageVolCreateXML, + .poolLookupByName = remoteStoragePoolLookupByName, /* 0.4.1 */ + .poolLookupByUUID = remoteStoragePoolLookupByUUID, /* 0.4.1 */ + .poolLookupByVolume = remoteStoragePoolLookupByVolume, /* 0.4.1 */ + .poolCreateXML = remoteStoragePoolCreateXML, /* 0.4.1 */ + .poolDefineXML = remoteStoragePoolDefineXML, /* 0.4.1 */ + .poolBuild = remoteStoragePoolBuild, /* 0.4.1 */ + .poolUndefine = remoteStoragePoolUndefine, /* 0.4.1 */ + .poolCreate = remoteStoragePoolCreate, /* 0.4.1 */ + .poolDestroy = remoteStoragePoolDestroy, /* 0.4.1 */ + .poolDelete = remoteStoragePoolDelete, /* 0.4.1 */ + .poolRefresh = remoteStoragePoolRefresh, /* 0.4.1 */ + .poolGetInfo = remoteStoragePoolGetInfo, /* 0.4.1 */ + .poolGetXMLDesc = remoteStoragePoolGetXMLDesc, /* 0.4.1 */ + .poolGetAutostart = remoteStoragePoolGetAutostart, /* 0.4.1 */ + .poolSetAutostart = remoteStoragePoolSetAutostart, /* 0.4.1 */ + .poolNumOfVolumes = remoteStoragePoolNumOfVolumes, /* 0.4.1 */ + .poolListVolumes = remoteStoragePoolListVolumes, /* 0.4.1 */ + + .volLookupByName = remoteStorageVolLookupByName, /* 0.4.1 */ + .volLookupByKey = remoteStorageVolLookupByKey, /* 0.4.1 */ + .volLookupByPath = remoteStorageVolLookupByPath, /* 0.4.1 */ + .volCreateXML = remoteStorageVolCreateXML, /* 0.4.1 */ .volCreateXMLFrom = remoteStorageVolCreateXMLFrom, .volDownload = remoteStorageVolDownload, .volUpload = remoteStorageVolUpload, - .volDelete = remoteStorageVolDelete, + .volDelete = remoteStorageVolDelete, /* 0.4.1 */ .volWipe = remoteStorageVolWipe, - .volGetInfo = remoteStorageVolGetInfo, - .volGetXMLDesc = remoteStorageVolGetXMLDesc, - .volGetPath = remoteStorageVolGetPath, - .poolIsActive = remoteStoragePoolIsActive, - .poolIsPersistent = remoteStoragePoolIsPersistent, + .volGetInfo = remoteStorageVolGetInfo, /* 0.4.1 */ + .volGetXMLDesc = remoteStorageVolGetXMLDesc, /* 0.4.1 */ + .volGetPath = remoteStorageVolGetPath, /* 0.4.1 */ + .poolIsActive = remoteStoragePoolIsActive, /* 0.7.3 */ + .poolIsPersistent = remoteStoragePoolIsPersistent, /* 0.7.3 */ }; static virSecretDriver secret_driver = { .name = "remote", - .open = remoteSecretOpen, - .close = remoteSecretClose, - .numOfSecrets = remoteNumOfSecrets, - .listSecrets = remoteListSecrets, - .lookupByUUID = remoteSecretLookupByUUID, - .lookupByUsage = remoteSecretLookupByUsage, - .defineXML = remoteSecretDefineXML, - .getXMLDesc = remoteSecretGetXMLDesc, - .setValue = remoteSecretSetValue, - .getValue = remoteSecretGetValue, - .undefine = remoteSecretUndefine + .open = remoteSecretOpen, /* 0.7.2 */ + .close = remoteSecretClose, /* 0.7.2 */ + .numOfSecrets = remoteNumOfSecrets, /* 0.7.2 */ + .listSecrets = remoteListSecrets, /* 0.7.2 */ + .lookupByUUID = remoteSecretLookupByUUID, /* 0.7.2 */ + .lookupByUsage = remoteSecretLookupByUsage, /* 0.7.2 */ + .defineXML = remoteSecretDefineXML, /* 0.7.2 */ + .getXMLDesc = remoteSecretGetXMLDesc, /* 0.7.2 */ + .setValue = remoteSecretSetValue, /* 0.7.2 */ + .getValue = remoteSecretGetValue, /* 0.7.2 */ + .undefine = remoteSecretUndefine /* 0.7.2 */ }; static virDeviceMonitor dev_monitor = { diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 752da98..8f5e735 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1062,17 +1062,17 @@ secretDriverReload(void) static virSecretDriver secretDriver = { .name = "secret", - .open = secretOpen, - .close = secretClose, - .numOfSecrets = secretNumOfSecrets, - .listSecrets = secretListSecrets, - .lookupByUUID = secretLookupByUUID, - .lookupByUsage = secretLookupByUsage, - .defineXML = secretDefineXML, - .getXMLDesc = secretGetXMLDesc, - .setValue = secretSetValue, - .getValue = secretGetValue, - .undefine = secretUndefine + .open = secretOpen, /* 0.7.1 */ + .close = secretClose, /* 0.7.1 */ + .numOfSecrets = secretNumOfSecrets, /* 0.7.1 */ + .listSecrets = secretListSecrets, /* 0.7.1 */ + .lookupByUUID = secretLookupByUUID, /* 0.7.1 */ + .lookupByUsage = secretLookupByUsage, /* 0.7.1 */ + .defineXML = secretDefineXML, /* 0.7.1 */ + .getXMLDesc = secretGetXMLDesc, /* 0.7.1 */ + .setValue = secretSetValue, /* 0.7.1 */ + .getValue = secretGetValue, /* 0.7.1 */ + .undefine = secretUndefine, /* 0.7.1 */ }; static virStateDriver stateDriver = { diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6542579..2da2feb 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2103,46 +2103,46 @@ cleanup: static virStorageDriver storageDriver = { .name = "storage", - .open = storageOpen, - .close = storageClose, - .numOfPools = storageNumPools, - .listPools = storageListPools, - .numOfDefinedPools = storageNumDefinedPools, - .listDefinedPools = storageListDefinedPools, - .findPoolSources = storageFindPoolSources, - .poolLookupByName = storagePoolLookupByName, - .poolLookupByUUID = storagePoolLookupByUUID, - .poolLookupByVolume = storagePoolLookupByVolume, - .poolCreateXML = storagePoolCreate, - .poolDefineXML = storagePoolDefine, - .poolBuild = storagePoolBuild, - .poolUndefine = storagePoolUndefine, - .poolCreate = storagePoolStart, - .poolDestroy = storagePoolDestroy, - .poolDelete = storagePoolDelete, - .poolRefresh = storagePoolRefresh, - .poolGetInfo = storagePoolGetInfo, - .poolGetXMLDesc = storagePoolGetXMLDesc, - .poolGetAutostart = storagePoolGetAutostart, - .poolSetAutostart = storagePoolSetAutostart, - .poolNumOfVolumes = storagePoolNumVolumes, - .poolListVolumes = storagePoolListVolumes, - - .volLookupByName = storageVolumeLookupByName, - .volLookupByKey = storageVolumeLookupByKey, - .volLookupByPath = storageVolumeLookupByPath, - .volCreateXML = storageVolumeCreateXML, - .volCreateXMLFrom = storageVolumeCreateXMLFrom, - .volDownload = storageVolumeDownload, - .volUpload = storageVolumeUpload, - .volDelete = storageVolumeDelete, - .volWipe = storageVolumeWipe, - .volGetInfo = storageVolumeGetInfo, - .volGetXMLDesc = storageVolumeGetXMLDesc, - .volGetPath = storageVolumeGetPath, - - .poolIsActive = storagePoolIsActive, - .poolIsPersistent = storagePoolIsPersistent, + .open = storageOpen, /* 0.4.0 */ + .close = storageClose, /* 0.4.0 */ + .numOfPools = storageNumPools, /* 0.4.0 */ + .listPools = storageListPools, /* 0.4.0 */ + .numOfDefinedPools = storageNumDefinedPools, /* 0.4.0 */ + .listDefinedPools = storageListDefinedPools, /* 0.4.0 */ + .findPoolSources = storageFindPoolSources, /* 0.4.0 */ + .poolLookupByName = storagePoolLookupByName, /* 0.4.0 */ + .poolLookupByUUID = storagePoolLookupByUUID, /* 0.4.0 */ + .poolLookupByVolume = storagePoolLookupByVolume, /* 0.4.0 */ + .poolCreateXML = storagePoolCreate, /* 0.4.0 */ + .poolDefineXML = storagePoolDefine, /* 0.4.0 */ + .poolBuild = storagePoolBuild, /* 0.4.0 */ + .poolUndefine = storagePoolUndefine, /* 0.4.0 */ + .poolCreate = storagePoolStart, /* 0.4.0 */ + .poolDestroy = storagePoolDestroy, /* 0.4.0 */ + .poolDelete = storagePoolDelete, /* 0.4.0 */ + .poolRefresh = storagePoolRefresh, /* 0.4.0 */ + .poolGetInfo = storagePoolGetInfo, /* 0.4.0 */ + .poolGetXMLDesc = storagePoolGetXMLDesc, /* 0.4.0 */ + .poolGetAutostart = storagePoolGetAutostart, /* 0.4.0 */ + .poolSetAutostart = storagePoolSetAutostart, /* 0.4.0 */ + .poolNumOfVolumes = storagePoolNumVolumes, /* 0.4.0 */ + .poolListVolumes = storagePoolListVolumes, /* 0.4.0 */ + + .volLookupByName = storageVolumeLookupByName, /* 0.4.0 */ + .volLookupByKey = storageVolumeLookupByKey, /* 0.4.0 */ + .volLookupByPath = storageVolumeLookupByPath, /* 0.4.0 */ + .volCreateXML = storageVolumeCreateXML, /* 0.4.0 */ + .volCreateXMLFrom = storageVolumeCreateXMLFrom, /* 0.6.4 */ + .volDownload = storageVolumeDownload, /* 0.9.0 */ + .volUpload = storageVolumeUpload, /* 0.9.0 */ + .volDelete = storageVolumeDelete, /* 0.4.0 */ + .volWipe = storageVolumeWipe, /* 0.8.0 */ + .volGetInfo = storageVolumeGetInfo, /* 0.4.0 */ + .volGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ + .volGetPath = storageVolumeGetPath, /* 0.4.0 */ + + .poolIsActive = storagePoolIsActive, /* 0.7.3 */ + .poolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 0e8d2bc..451d97a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5339,29 +5339,29 @@ static int testNWFilterClose(virConnectPtr conn) { static virDriver testDriver = { VIR_DRV_TEST, "Test", - .open = testOpen, - .close = testClose, - .version = testGetVersion, + .open = testOpen, /* 0.1.1 */ + .close = testClose, /* 0.1.1 */ + .version = testGetVersion, /* 0.1.1 */ .getHostname = virGetHostname, .getMaxVcpus = testGetMaxVCPUs, - .nodeGetInfo = testNodeGetInfo, + .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ .getCapabilities = testGetCapabilities, - .listDomains = testListDomains, - .numOfDomains = testNumOfDomains, + .listDomains = testListDomains, /* 0.1.1 */ + .numOfDomains = testNumOfDomains, /* 0.1.1 */ .domainCreateXML = testDomainCreateXML, - .domainLookupByID = testLookupDomainByID, - .domainLookupByUUID = testLookupDomainByUUID, - .domainLookupByName = testLookupDomainByName, - .domainSuspend = testPauseDomain, - .domainResume = testResumeDomain, - .domainShutdown = testShutdownDomain, - .domainReboot = testRebootDomain, - .domainDestroy = testDestroyDomain, + .domainLookupByID = testLookupDomainByID, /* 0.1.1 */ + .domainLookupByUUID = testLookupDomainByUUID, /* 0.1.1 */ + .domainLookupByName = testLookupDomainByName, /* 0.1.1 */ + .domainSuspend = testPauseDomain, /* 0.1.1 */ + .domainResume = testResumeDomain, /* 0.1.1 */ + .domainShutdown = testShutdownDomain, /* 0.1.1 */ + .domainReboot = testRebootDomain, /* 0.1.1 */ + .domainDestroy = testDestroyDomain, /* 0.1.1 */ .domainGetOSType = testGetOSType, .domainGetMaxMemory = testGetMaxMemory, - .domainSetMaxMemory = testSetMaxMemory, + .domainSetMaxMemory = testSetMaxMemory, /* 0.1.1 */ .domainSetMemory = testSetMemory, - .domainGetInfo = testGetDomainInfo, + .domainGetInfo = testGetDomainInfo, /* 0.1.1 */ .domainSave = testDomainSave, .domainRestore = testDomainRestore, .domainCoreDump = testDomainCoreDump, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 9813972..ebfd065 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2146,42 +2146,42 @@ cleanup: static virDriver umlDriver = { VIR_DRV_UML, "UML", - .open = umlOpen, - .close = umlClose, - .type = umlGetType, - .version = umlGetVersion, - .getHostname = virGetHostname, - .nodeGetInfo = nodeGetInfo, - .getCapabilities = umlGetCapabilities, - .listDomains = umlListDomains, - .numOfDomains = umlNumDomains, - .domainCreateXML = umlDomainCreate, - .domainLookupByID = umlDomainLookupByID, - .domainLookupByUUID = umlDomainLookupByUUID, - .domainLookupByName = umlDomainLookupByName, - .domainShutdown = umlDomainShutdown, - .domainDestroy = umlDomainDestroy, - .domainGetOSType = umlDomainGetOSType, - .domainGetMaxMemory = umlDomainGetMaxMemory, - .domainSetMaxMemory = umlDomainSetMaxMemory, - .domainSetMemory = umlDomainSetMemory, - .domainGetInfo = umlDomainGetInfo, - .domainGetXMLDesc = umlDomainGetXMLDesc, - .listDefinedDomains = umlListDefinedDomains, - .numOfDefinedDomains = umlNumDefinedDomains, - .domainCreate = umlDomainStart, + .open = umlOpen, /* 0.5.0 */ + .close = umlClose, /* 0.5.0 */ + .type = umlGetType, /* 0.5.0 */ + .version = umlGetVersion, /* 0.5.0 */ + .getHostname = virGetHostname, /* 0.5.0 */ + .nodeGetInfo = nodeGetInfo, /* 0.5.0 */ + .getCapabilities = umlGetCapabilities, /* 0.5.0 */ + .listDomains = umlListDomains, /* 0.5.0 */ + .numOfDomains = umlNumDomains, /* 0.5.0 */ + .domainCreateXML = umlDomainCreate, /* 0.5.0 */ + .domainLookupByID = umlDomainLookupByID, /* 0.5.0 */ + .domainLookupByUUID = umlDomainLookupByUUID, /* 0.5.0 */ + .domainLookupByName = umlDomainLookupByName, /* 0.5.0 */ + .domainShutdown = umlDomainShutdown, /* 0.5.0 */ + .domainDestroy = umlDomainDestroy, /* 0.5.0 */ + .domainGetOSType = umlDomainGetOSType, /* 0.5.0 */ + .domainGetMaxMemory = umlDomainGetMaxMemory, /* 0.5.0 */ + .domainSetMaxMemory = umlDomainSetMaxMemory, /* 0.5.0 */ + .domainSetMemory = umlDomainSetMemory, /* 0.5.0 */ + .domainGetInfo = umlDomainGetInfo, /* 0.5.0 */ + .domainGetXMLDesc = umlDomainGetXMLDesc, /* 0.5.0 */ + .listDefinedDomains = umlListDefinedDomains, /* 0.5.0 */ + .numOfDefinedDomains = umlNumDefinedDomains, /* 0.5.0 */ + .domainCreate = umlDomainStart, /* 0.5.0 */ .domainCreateWithFlags = umlDomainStartWithFlags, - .domainDefineXML = umlDomainDefine, - .domainUndefine = umlDomainUndefine, + .domainDefineXML = umlDomainDefine, /* 0.5.0 */ + .domainUndefine = umlDomainUndefine, /* 0.5.0 */ .domainAttachDevice = umlDomainAttachDevice, .domainAttachDeviceFlags = umlDomainAttachDeviceFlags, .domainDetachDevice = umlDomainDetachDevice, .domainDetachDeviceFlags = umlDomainDetachDeviceFlags, - .domainGetAutostart = umlDomainGetAutostart, - .domainSetAutostart = umlDomainSetAutostart, - .domainBlockPeek = umlDomainBlockPeek, - .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, - .nodeGetFreeMemory = nodeGetFreeMemory, + .domainGetAutostart = umlDomainGetAutostart, /* 0.5.0 */ + .domainSetAutostart = umlDomainSetAutostart, /* 0.5.0 */ + .domainBlockPeek = umlDomainBlockPeek, /* 0.5.0 */ + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.5.0 */ + .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.5.0 */ .isEncrypted = umlIsEncrypted, .isSecure = umlIsSecure, .domainIsActive = umlDomainIsActive, diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index c737263..a97d783 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -8663,42 +8663,42 @@ endjob: virDriver NAME(Driver) = { VIR_DRV_VBOX, "VBOX", - .open = vboxOpen, - .close = vboxClose, - .version = vboxGetVersion, - .getHostname = virGetHostname, - .getMaxVcpus = vboxGetMaxVcpus, - .nodeGetInfo = nodeGetInfo, - .getCapabilities = vboxGetCapabilities, - .listDomains = vboxListDomains, - .numOfDomains = vboxNumOfDomains, - .domainCreateXML = vboxDomainCreateXML, - .domainLookupByID = vboxDomainLookupByID, - .domainLookupByUUID = vboxDomainLookupByUUID, - .domainLookupByName = vboxDomainLookupByName, - .domainSuspend = vboxDomainSuspend, - .domainResume = vboxDomainResume, - .domainShutdown = vboxDomainShutdown, - .domainReboot = vboxDomainReboot, - .domainDestroy = vboxDomainDestroy, - .domainGetOSType = vboxDomainGetOSType, - .domainSetMemory = vboxDomainSetMemory, - .domainGetInfo = vboxDomainGetInfo, - .domainSave = vboxDomainSave, + .open = vboxOpen, /* 0.6.3 */ + .close = vboxClose, /* 0.6.3 */ + .version = vboxGetVersion, /* 0.6.3 */ + .getHostname = virGetHostname, /* 0.6.3 */ + .getMaxVcpus = vboxGetMaxVcpus, /* 0.6.3 */ + .nodeGetInfo = nodeGetInfo, /* 0.6.3 */ + .getCapabilities = vboxGetCapabilities, /* 0.6.3 */ + .listDomains = vboxListDomains, /* 0.6.3 */ + .numOfDomains = vboxNumOfDomains, /* 0.6.3 */ + .domainCreateXML = vboxDomainCreateXML, /* 0.6.3 */ + .domainLookupByID = vboxDomainLookupByID, /* 0.6.3 */ + .domainLookupByUUID = vboxDomainLookupByUUID, /* 0.6.3 */ + .domainLookupByName = vboxDomainLookupByName, /* 0.6.3 */ + .domainSuspend = vboxDomainSuspend, /* 0.6.3 */ + .domainResume = vboxDomainResume, /* 0.6.3 */ + .domainShutdown = vboxDomainShutdown, /* 0.6.3 */ + .domainReboot = vboxDomainReboot, /* 0.6.3 */ + .domainDestroy = vboxDomainDestroy, /* 0.6.3 */ + .domainGetOSType = vboxDomainGetOSType, /* 0.6.3 */ + .domainSetMemory = vboxDomainSetMemory, /* 0.6.3 */ + .domainGetInfo = vboxDomainGetInfo, /* 0.6.3 */ + .domainSave = vboxDomainSave, /* 0.6.3 */ .domainSetVcpus = vboxDomainSetVcpus, .domainSetVcpusFlags = vboxDomainSetVcpusFlags, .domainGetVcpusFlags = vboxDomainGetVcpusFlags, .domainGetMaxVcpus = vboxDomainGetMaxVcpus, - .domainGetXMLDesc = vboxDomainGetXMLDesc, - .listDefinedDomains = vboxListDefinedDomains, - .numOfDefinedDomains = vboxNumOfDefinedDomains, - .domainCreate = vboxDomainCreate, + .domainGetXMLDesc = vboxDomainGetXMLDesc, /* 0.6.3 */ + .listDefinedDomains = vboxListDefinedDomains, /* 0.6.3 */ + .numOfDefinedDomains = vboxNumOfDefinedDomains, /* 0.6.3 */ + .domainCreate = vboxDomainCreate, /* 0.6.3 */ .domainCreateWithFlags = vboxDomainCreateWithFlags, - .domainDefineXML = vboxDomainDefineXML, - .domainUndefine = vboxDomainUndefine, - .domainAttachDevice = vboxDomainAttachDevice, + .domainDefineXML = vboxDomainDefineXML, /* 0.6.3 */ + .domainUndefine = vboxDomainUndefine, /* 0.6.3 */ + .domainAttachDevice = vboxDomainAttachDevice, /* 0.6.3 */ .domainAttachDeviceFlags = vboxDomainAttachDeviceFlags, - .domainDetachDevice = vboxDomainDetachDevice, + .domainDetachDevice = vboxDomainDetachDevice, /* 0.6.3 */ .domainDetachDeviceFlags = vboxDomainDetachDeviceFlags, .domainUpdateDeviceFlags = vboxDomainUpdateDeviceFlags, .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 44876ba..19b0db4 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -899,32 +899,32 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) static virDriver vmwareDriver = { VIR_DRV_VMWARE, "VMWARE", - .open = vmwareOpen, - .close = vmwareClose, - .type = vmwareGetType, - .version = vmwareGetVersion, - .listDomains = vmwareListDomains, - .numOfDomains = vmwareNumDomains, - .domainCreateXML = vmwareDomainCreateXML, - .domainLookupByID = vmwareDomainLookupByID, - .domainLookupByUUID = vmwareDomainLookupByUUID, - .domainLookupByName = vmwareDomainLookupByName, - .domainSuspend = vmwareDomainSuspend, - .domainResume = vmwareDomainResume, - .domainShutdown = vmwareDomainShutdown, - .domainReboot = vmwareDomainReboot, - .domainDestroy = vmwareDomainShutdown, - .domainGetOSType = vmwareGetOSType, - .domainGetInfo = vmwareDomainGetInfo, - .domainGetXMLDesc = vmwareDomainGetXMLDesc, - .listDefinedDomains = vmwareListDefinedDomains, - .numOfDefinedDomains = vmwareNumDefinedDomains, - .domainCreate = vmwareDomainCreate, - .domainCreateWithFlags = vmwareDomainCreateWithFlags, - .domainDefineXML = vmwareDomainDefineXML, - .domainUndefine = vmwareDomainUndefine, - .domainIsActive = vmwareDomainIsActive, - .domainIsPersistent = vmwareDomainIsPersistent, + .open = vmwareOpen, /* 0.8.7 */ + .close = vmwareClose, /* 0.8.7 */ + .type = vmwareGetType, /* 0.8.7 */ + .version = vmwareGetVersion, /* 0.8.7 */ + .listDomains = vmwareListDomains, /* 0.8.7 */ + .numOfDomains = vmwareNumDomains, /* 0.8.7 */ + .domainCreateXML = vmwareDomainCreateXML, /* 0.8.7 */ + .domainLookupByID = vmwareDomainLookupByID, /* 0.8.7 */ + .domainLookupByUUID = vmwareDomainLookupByUUID, /* 0.8.7 */ + .domainLookupByName = vmwareDomainLookupByName, /* 0.8.7 */ + .domainSuspend = vmwareDomainSuspend, /* 0.8.7 */ + .domainResume = vmwareDomainResume, /* 0.8.7 */ + .domainShutdown = vmwareDomainShutdown, /* 0.8.7 */ + .domainReboot = vmwareDomainReboot, /* 0.8.7 */ + .domainDestroy = vmwareDomainShutdown, /* 0.8.7 */ + .domainGetOSType = vmwareGetOSType, /* 0.8.7 */ + .domainGetInfo = vmwareDomainGetInfo, /* 0.8.7 */ + .domainGetXMLDesc = vmwareDomainGetXMLDesc, /* 0.8.7 */ + .listDefinedDomains = vmwareListDefinedDomains, /* 0.8.7 */ + .numOfDefinedDomains = vmwareNumDefinedDomains, /* 0.8.7 */ + .domainCreate = vmwareDomainCreate, /* 0.8.7 */ + .domainCreateWithFlags = vmwareDomainCreateWithFlags, /* 0.8.7 */ + .domainDefineXML = vmwareDomainDefineXML, /* 0.8.7 */ + .domainUndefine = vmwareDomainUndefine, /* 0.8.7 */ + .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ + .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ }; int diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 953d09e..8c3b153 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2101,52 +2101,52 @@ cleanup: static virDriver xenUnifiedDriver = { VIR_DRV_XEN_UNIFIED, "Xen", - .open = xenUnifiedOpen, - .close = xenUnifiedClose, + .open = xenUnifiedOpen, /* 0.0.3 */ + .close = xenUnifiedClose, /* 0.0.3 */ .supports_feature = xenUnifiedSupportsFeature, - .type = xenUnifiedType, - .version = xenUnifiedGetVersion, + .type = xenUnifiedType, /* 0.0.3 */ + .version = xenUnifiedGetVersion, /* 0.0.3 */ .getHostname = virGetHostname, .getMaxVcpus = xenUnifiedGetMaxVcpus, - .nodeGetInfo = xenUnifiedNodeGetInfo, + .nodeGetInfo = xenUnifiedNodeGetInfo, /* 0.1.0 */ .getCapabilities = xenUnifiedGetCapabilities, - .listDomains = xenUnifiedListDomains, - .numOfDomains = xenUnifiedNumOfDomains, - .domainCreateXML = xenUnifiedDomainCreateXML, - .domainLookupByID = xenUnifiedDomainLookupByID, - .domainLookupByUUID = xenUnifiedDomainLookupByUUID, - .domainLookupByName = xenUnifiedDomainLookupByName, - .domainSuspend = xenUnifiedDomainSuspend, - .domainResume = xenUnifiedDomainResume, - .domainShutdown = xenUnifiedDomainShutdown, - .domainReboot = xenUnifiedDomainReboot, - .domainDestroy = xenUnifiedDomainDestroy, - .domainGetOSType = xenUnifiedDomainGetOSType, - .domainGetMaxMemory = xenUnifiedDomainGetMaxMemory, - .domainSetMaxMemory = xenUnifiedDomainSetMaxMemory, - .domainSetMemory = xenUnifiedDomainSetMemory, - .domainGetInfo = xenUnifiedDomainGetInfo, - .domainSave = xenUnifiedDomainSave, - .domainRestore = xenUnifiedDomainRestore, - .domainCoreDump = xenUnifiedDomainCoreDump, - .domainSetVcpus = xenUnifiedDomainSetVcpus, + .listDomains = xenUnifiedListDomains, /* 0.0.3 */ + .numOfDomains = xenUnifiedNumOfDomains, /* 0.0.3 */ + .domainCreateXML = xenUnifiedDomainCreateXML, /* 0.0.3 */ + .domainLookupByID = xenUnifiedDomainLookupByID, /* 0.0.3 */ + .domainLookupByUUID = xenUnifiedDomainLookupByUUID, /* 0.0.5 */ + .domainLookupByName = xenUnifiedDomainLookupByName, /* 0.0.3 */ + .domainSuspend = xenUnifiedDomainSuspend, /* 0.0.3 */ + .domainResume = xenUnifiedDomainResume, /* 0.0.3 */ + .domainShutdown = xenUnifiedDomainShutdown, /* 0.0.3 */ + .domainReboot = xenUnifiedDomainReboot, /* 0.1.0 */ + .domainDestroy = xenUnifiedDomainDestroy, /* 0.0.3 */ + .domainGetOSType = xenUnifiedDomainGetOSType, /* 0.0.3 */ + .domainGetMaxMemory = xenUnifiedDomainGetMaxMemory, /* 0.0.3 */ + .domainSetMaxMemory = xenUnifiedDomainSetMaxMemory, /* 0.0.3 */ + .domainSetMemory = xenUnifiedDomainSetMemory, /* 0.1.1 */ + .domainGetInfo = xenUnifiedDomainGetInfo, /* 0.0.3 */ + .domainSave = xenUnifiedDomainSave, /* 0.0.3 */ + .domainRestore = xenUnifiedDomainRestore, /* 0.0.3 */ + .domainCoreDump = xenUnifiedDomainCoreDump, /* 0.1.9 */ + .domainSetVcpus = xenUnifiedDomainSetVcpus, /* 0.1.4 */ .domainSetVcpusFlags = xenUnifiedDomainSetVcpusFlags, .domainGetVcpusFlags = xenUnifiedDomainGetVcpusFlags, - .domainPinVcpu = xenUnifiedDomainPinVcpu, - .domainGetVcpus = xenUnifiedDomainGetVcpus, + .domainPinVcpu = xenUnifiedDomainPinVcpu, /* 0.1.4 */ + .domainGetVcpus = xenUnifiedDomainGetVcpus, /* 0.1.4 */ .domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus, - .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc, + .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc, /* 0.0.3 */ .domainXMLFromNative = xenUnifiedDomainXMLFromNative, .domainXMLToNative = xenUnifiedDomainXMLToNative, - .listDefinedDomains = xenUnifiedListDefinedDomains, - .numOfDefinedDomains = xenUnifiedNumOfDefinedDomains, - .domainCreate = xenUnifiedDomainCreate, + .listDefinedDomains = xenUnifiedListDefinedDomains, /* 0.1.1 */ + .numOfDefinedDomains = xenUnifiedNumOfDefinedDomains, /* 0.1.5 */ + .domainCreate = xenUnifiedDomainCreate, /* 0.1.1 */ .domainCreateWithFlags = xenUnifiedDomainCreateWithFlags, - .domainDefineXML = xenUnifiedDomainDefineXML, - .domainUndefine = xenUnifiedDomainUndefine, - .domainAttachDevice = xenUnifiedDomainAttachDevice, + .domainDefineXML = xenUnifiedDomainDefineXML, /* 0.1.1 */ + .domainUndefine = xenUnifiedDomainUndefine, /* 0.1.1 */ + .domainAttachDevice = xenUnifiedDomainAttachDevice, /* 0.1.9 */ .domainAttachDeviceFlags = xenUnifiedDomainAttachDeviceFlags, - .domainDetachDevice = xenUnifiedDomainDetachDevice, + .domainDetachDevice = xenUnifiedDomainDetachDevice, /* 0.1.9 */ .domainDetachDeviceFlags = xenUnifiedDomainDetachDeviceFlags, .domainUpdateDeviceFlags = xenUnifiedDomainUpdateDeviceFlags, .domainGetAutostart = xenUnifiedDomainGetAutostart, @@ -2164,17 +2164,17 @@ static virDriver xenUnifiedDriver = { .nodeGetFreeMemory = xenUnifiedNodeGetFreeMemory, .domainEventRegister = xenUnifiedDomainEventRegister, .domainEventDeregister = xenUnifiedDomainEventDeregister, - .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, - .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, - .nodeDeviceReset = xenUnifiedNodeDeviceReset, - .isEncrypted = xenUnifiedIsEncrypted, - .isSecure = xenUnifiedIsSecure, - .domainIsActive = xenUnifiedDomainIsActive, - .domainIsPersistent = xenUnifiedDomainIsPersistent, - .domainIsUpdated = xenUnifiedDomainIsUpdated, - .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny, - .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, - .domainOpenConsole = xenUnifiedDomainOpenConsole, + .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, /* 0.6.1 */ + .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, /* 0.6.1 */ + .nodeDeviceReset = xenUnifiedNodeDeviceReset, /* 0.6.1 */ + .isEncrypted = xenUnifiedIsEncrypted, /* 0.7.3 */ + .isSecure = xenUnifiedIsSecure, /* 0.7.3 */ + .domainIsActive = xenUnifiedDomainIsActive, /* 0.7.3 */ + .domainIsPersistent = xenUnifiedDomainIsPersistent, /* 0.7.3 */ + .domainIsUpdated = xenUnifiedDomainIsUpdated, /* 0.8.6 */ + .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny, /* 0.8.0 */ + .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, /* 0.8.0 */ + .domainOpenConsole = xenUnifiedDomainOpenConsole, /* 0.8.6 */ }; /** diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 6bfc163..7a00367 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1781,48 +1781,48 @@ xenapiNodeGetCellsFreeMemory (virConnectPtr conn, unsigned long long *freeMems, static virDriver xenapiDriver = { VIR_DRV_XENAPI, "XenAPI", - .open = xenapiOpen, - .close = xenapiClose, - .supports_feature = xenapiSupportsFeature, - .type = xenapiType, - .version = xenapiGetVersion, - .getHostname = xenapiGetHostname, - .getMaxVcpus = xenapiGetMaxVcpus, - .nodeGetInfo = xenapiNodeGetInfo, - .getCapabilities = xenapiGetCapabilities, - .listDomains = xenapiListDomains, - .numOfDomains = xenapiNumOfDomains, - .domainCreateXML = xenapiDomainCreateXML, - .domainLookupByID = xenapiDomainLookupByID, - .domainLookupByUUID = xenapiDomainLookupByUUID, - .domainLookupByName = xenapiDomainLookupByName, - .domainSuspend = xenapiDomainSuspend, - .domainResume = xenapiDomainResume, - .domainShutdown = xenapiDomainShutdown, - .domainReboot = xenapiDomainReboot, - .domainDestroy = xenapiDomainDestroy, - .domainGetOSType = xenapiDomainGetOSType, - .domainGetMaxMemory = xenapiDomainGetMaxMemory, - .domainSetMaxMemory = xenapiDomainSetMaxMemory, - .domainGetInfo = xenapiDomainGetInfo, - .domainSetVcpus = xenapiDomainSetVcpus, + .open = xenapiOpen, /* 0.8.0 */ + .close = xenapiClose, /* 0.8.0 */ + .supports_feature = xenapiSupportsFeature, /* 0.8.0 */ + .type = xenapiType, /* 0.8.0 */ + .version = xenapiGetVersion, /* 0.8.0 */ + .getHostname = xenapiGetHostname, /* 0.8.0 */ + .getMaxVcpus = xenapiGetMaxVcpus, /* 0.8.0 */ + .nodeGetInfo = xenapiNodeGetInfo, /* 0.8.0 */ + .getCapabilities = xenapiGetCapabilities, /* 0.8.0 */ + .listDomains = xenapiListDomains, /* 0.8.0 */ + .numOfDomains = xenapiNumOfDomains, /* 0.8.0 */ + .domainCreateXML = xenapiDomainCreateXML, /* 0.8.0 */ + .domainLookupByID = xenapiDomainLookupByID, /* 0.8.0 */ + .domainLookupByUUID = xenapiDomainLookupByUUID, /* 0.8.0 */ + .domainLookupByName = xenapiDomainLookupByName, /* 0.8.0 */ + .domainSuspend = xenapiDomainSuspend, /* 0.8.0 */ + .domainResume = xenapiDomainResume, /* 0.8.0 */ + .domainShutdown = xenapiDomainShutdown, /* 0.8.0 */ + .domainReboot = xenapiDomainReboot, /* 0.8.0 */ + .domainDestroy = xenapiDomainDestroy, /* 0.8.0 */ + .domainGetOSType = xenapiDomainGetOSType, /* 0.8.0 */ + .domainGetMaxMemory = xenapiDomainGetMaxMemory, /* 0.8.0 */ + .domainSetMaxMemory = xenapiDomainSetMaxMemory, /* 0.8.0 */ + .domainGetInfo = xenapiDomainGetInfo, /* 0.8.0 */ + .domainSetVcpus = xenapiDomainSetVcpus, /* 0.8.0 */ .domainSetVcpusFlags = xenapiDomainSetVcpusFlags, .domainGetVcpusFlags = xenapiDomainGetVcpusFlags, - .domainPinVcpu = xenapiDomainPinVcpu, - .domainGetVcpus = xenapiDomainGetVcpus, - .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, - .domainGetXMLDesc = xenapiDomainGetXMLDesc, - .listDefinedDomains = xenapiListDefinedDomains, - .numOfDefinedDomains = xenapiNumOfDefinedDomains, - .domainCreate = xenapiDomainCreate, + .domainPinVcpu = xenapiDomainPinVcpu, /* 0.8.0 */ + .domainGetVcpus = xenapiDomainGetVcpus, /* 0.8.0 */ + .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, /* 0.8.0 */ + .domainGetXMLDesc = xenapiDomainGetXMLDesc, /* 0.8.0 */ + .listDefinedDomains = xenapiListDefinedDomains, /* 0.8.0 */ + .numOfDefinedDomains = xenapiNumOfDefinedDomains, /* 0.8.0 */ + .domainCreate = xenapiDomainCreate, /* 0.8.0 */ .domainCreateWithFlags = xenapiDomainCreateWithFlags, - .domainDefineXML = xenapiDomainDefineXML, - .domainUndefine = xenapiDomainUndefine, - .domainGetAutostart = xenapiDomainGetAutostart, - .domainSetAutostart = xenapiDomainSetAutostart, - .domainGetSchedulerType = xenapiDomainGetSchedulerType, - .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, - .nodeGetFreeMemory = xenapiNodeGetFreeMemory, + .domainDefineXML = xenapiDomainDefineXML, /* 0.8.0 */ + .domainUndefine = xenapiDomainUndefine, /* 0.8.0 */ + .domainGetAutostart = xenapiDomainGetAutostart, /* 0.8.0 */ + .domainSetAutostart = xenapiDomainSetAutostart, /* 0.8.0 */ + .domainGetSchedulerType = xenapiDomainGetSchedulerType, /* 0.8.0 */ + .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, /* 0.8.0 */ + .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, }; -- 1.7.4.4
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file.
To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
I love the idea! But I ran out of time to finish reviewing it today. Did you test VPATH builds? (autogen.sh will help). Did you test 'make distcheck' to ensure the tarball is complete? -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Fri, May 13, 2011 at 05:31:54PM -0600, Eric Blake wrote:
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file.
To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
I love the idea! But I ran out of time to finish reviewing it today. Did you test VPATH builds? (autogen.sh will help). Did you test 'make distcheck' to ensure the tarball is complete?
I like the idea too, except for the perl part, does it make it mandatory to have perl to build now (the remote generator may have pushed that dependancy already though). I would actually put patch 4 first since it's a no-op and then patch 3 since it depends on 4 for the genration (but it's a detail). Checking the full patch 4 seems hard did you just diff the current version and generated one (I would guess so) ? If yes ACK from me after checking builds as Eric suggests, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On Mon, May 16, 2011 at 03:19:37PM +0800, Daniel Veillard wrote:
On Fri, May 13, 2011 at 05:31:54PM -0600, Eric Blake wrote:
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file.
To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
I love the idea! But I ran out of time to finish reviewing it today. Did you test VPATH builds? (autogen.sh will help). Did you test 'make distcheck' to ensure the tarball is complete?
I like the idea too, except for the perl part, does it make it mandatory to have perl to build now (the remote generator may have pushed that dependancy already though).
Perl is already mandatory for people building from GIT, so this doesn't change that requirement at all.
I would actually put patch 4 first since it's a no-op and then patch 3 since it depends on 4 for the genration (but it's a detail).
Yep, I've reordered this.
Checking the full patch 4 seems hard did you just diff the current version and generated one (I would guess so) ? If yes ACK from me after checking builds as Eric suggests,
The current generated one is too incomplete to be useful for comparison. I've basically worked on each driver in turn. Starting with APIs present when the driver was introduced, then viewing a git diff between subsequent releases tags, to identify what APIs were added in each release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Fri, May 13, 2011 at 05:31:54PM -0600, Eric Blake wrote:
On 05/13/2011 07:36 AM, Daniel P. Berrange wrote:
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file.
To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
I love the idea! But I ran out of time to finish reviewing it today. Did you test VPATH builds? (autogen.sh will help). Did you test 'make distcheck' to ensure the tarball is complete?
There was a small typo in the makefile rule wrt VPATH builds which I've not fixed. Everything is correct inside the tarball too. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Fri, May 13, 2011 at 02:36:55PM +0100, Daniel P. Berrange wrote:
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file.
To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
In libguestfs we generate the equivalent information entirely automatically. See: http://git.annexia.org/?p=libguestfs.git;a=tree;f=src/api-support;hb=HEAD http://git.annexia.org/?p=libguestfs.git;a=blob;f=src/api-support/update-fro... It requires access to a directory containing all the {libguestfs|libvirt} tarballs from every released version. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v
On Mon, May 16, 2011 at 10:41:52AM +0100, Richard W.M. Jones wrote:
On Fri, May 13, 2011 at 02:36:55PM +0100, Daniel P. Berrange wrote:
The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file.
To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated
In libguestfs we generate the equivalent information entirely automatically. See:
http://git.annexia.org/?p=libguestfs.git;a=tree;f=src/api-support;hb=HEAD http://git.annexia.org/?p=libguestfs.git;a=blob;f=src/api-support/update-fro...
It requires access to a directory containing all the {libguestfs|libvirt} tarballs from every released version.
That is just providing a list of public APIs per version. We already generate that information from the src/libvirt_public.syms file which has the public API versioning script. The annotations are required in order to specify what each internal driver implementation supports. Extracting this information from the historical tarballs is too complex, unless we actually ran a proper C parser over each codebase to extract the internal structs and methods used. In the end, just annotating the drivers is far simpler, than writing an even more complex script. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (4)
-
Daniel P. Berrange -
Daniel Veillard -
Eric Blake -
Richard W.M. Jones