Convert all drivers to use old-style struct initializers; this makes a handy

built-in TODO list for each driver.  Also rip out the internal getURI method;
it is never used by any of the drivers, and was buggy to boot.
This commit is contained in:
Chris Lalancette 2009-03-31 15:47:16 +00:00
parent c61180dcd7
commit 4d3d0039e5
17 changed files with 156 additions and 160 deletions

View File

@ -1,3 +1,13 @@
Tue Mar 31 17:40:00 CEST 2009 Chris Lalancette <clalance@redhat.com>
* src/lxc_driver.c, src/openvz_driver.c, src/qemu_driver.c,
src/remote_internal.c, src/test.c, src/uml_driver.c, src/xen_unified.c,
src/driver.h, src/libvirt.c, src/proxy_internal.c, src/xen_inotify.c,
src/xen_internal.c, src/xen_unified.h, src/xend_internal.c,
src/xm_internal.c, src/xs_internal.c: Convert all drivers to use
old-style struct initializers; this makes a handy built-in TODO list
for each driver. Also rip out the internal getURI method; it was never
used by any of the drivers, and was buggy to boot.
Tue Mar 31 14:44:16 CEST 2009 Daniel Veillard <veillard@redhat.com> Tue Mar 31 14:44:16 CEST 2009 Daniel Veillard <veillard@redhat.com>
* libvirt.spec.in: better modularization of the spec file, * libvirt.spec.in: better modularization of the spec file,

View File

@ -351,7 +351,6 @@ struct _virDriver {
virDrvGetType type; virDrvGetType type;
virDrvGetVersion version; virDrvGetVersion version;
virDrvGetHostname getHostname; virDrvGetHostname getHostname;
virDrvGetURI getURI;
virDrvGetMaxVcpus getMaxVcpus; virDrvGetMaxVcpus getMaxVcpus;
virDrvNodeGetInfo nodeGetInfo; virDrvNodeGetInfo nodeGetInfo;
virDrvGetCapabilities getCapabilities; virDrvGetCapabilities getCapabilities;

View File

@ -1321,15 +1321,6 @@ virConnectGetURI (virConnectPtr conn)
return NULL; return NULL;
} }
/* Drivers may override getURI, but if they don't then
* we provide a default implementation.
*/
if (conn->driver->getURI) {
name = conn->driver->getURI (conn);
if (!name)
goto error;
}
name = (char *)xmlSaveUri(conn->uri); name = (char *)xmlSaveUri(conn->uri);
if (!name) { if (!name) {
virReportOOMError (conn); virReportOOMError (conn);

View File

@ -1414,7 +1414,6 @@ static virDriver lxcDriver = {
NULL, /* type */ NULL, /* type */
lxcVersion, /* version */ lxcVersion, /* version */
NULL, /* getHostname */ NULL, /* getHostname */
NULL, /* getURI */
NULL, /* getMaxVcpus */ NULL, /* getMaxVcpus */
NULL, /* nodeGetInfo */ NULL, /* nodeGetInfo */
NULL, /* getCapabilities */ NULL, /* getCapabilities */
@ -1469,7 +1468,7 @@ static virDriver lxcDriver = {
NULL, /* domainEventDeregister */ NULL, /* domainEventDeregister */
NULL, /* domainMigratePrepare2 */ NULL, /* domainMigratePrepare2 */
NULL, /* domainMigrateFinish2 */ NULL, /* domainMigrateFinish2 */
NULL, /* nodeDeviceAttach */ NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */ NULL, /* nodeDeviceReset */
}; };

View File

@ -1314,8 +1314,7 @@ static virDriver openvzDriver = {
NULL, /* supports_feature */ NULL, /* supports_feature */
openvzGetType, /* type */ openvzGetType, /* type */
openvzGetVersion, /* version */ openvzGetVersion, /* version */
NULL, /* hostname */ NULL, /* getHostname */
NULL, /* uri */
openvzGetMaxVCPUs, /* getMaxVcpus */ openvzGetMaxVCPUs, /* getMaxVcpus */
openvzGetNodeInfo, /* nodeGetInfo */ openvzGetNodeInfo, /* nodeGetInfo */
openvzGetCapabilities, /* getCapabilities */ openvzGetCapabilities, /* getCapabilities */
@ -1345,8 +1344,8 @@ static virDriver openvzDriver = {
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
openvzDomainDumpXML, /* domainDumpXML */ openvzDomainDumpXML, /* domainDumpXML */
openvzListDefinedDomains, /* listDomains */ openvzListDefinedDomains, /* listDefinedDomains */
openvzNumDefinedDomains, /* numOfDomains */ openvzNumDefinedDomains, /* numOfDefinedDomains */
openvzDomainCreate, /* domainCreate */ openvzDomainCreate, /* domainCreate */
openvzDomainDefineXML, /* domainDefineXML */ openvzDomainDefineXML, /* domainDefineXML */
openvzDomainUndefine, /* domainUndefine */ openvzDomainUndefine, /* domainUndefine */
@ -1365,12 +1364,12 @@ static virDriver openvzDriver = {
NULL, /* domainBlockPeek */ NULL, /* domainBlockPeek */
NULL, /* domainMemoryPeek */ NULL, /* domainMemoryPeek */
NULL, /* nodeGetCellsFreeMemory */ NULL, /* nodeGetCellsFreeMemory */
NULL, /* nodeGetFreeMemory */ NULL, /* getFreeMemory */
NULL, /* domainEventRegister */ NULL, /* domainEventRegister */
NULL, /* domainEventDeregister */ NULL, /* domainEventDeregister */
NULL, /* domainMigratePrepare2 */ NULL, /* domainMigratePrepare2 */
NULL, /* domainMigrateFinish2 */ NULL, /* domainMigrateFinish2 */
NULL, /* nodeDeviceAttach */ NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */ NULL, /* nodeDeviceReset */
}; };

View File

@ -50,7 +50,6 @@ struct xenUnifiedDriver xenProxyDriver = {
xenProxyClose, /* close */ xenProxyClose, /* close */
xenProxyGetVersion, /* version */ xenProxyGetVersion, /* version */
NULL, /* hostname */ NULL, /* hostname */
NULL, /* URI */
xenProxyNodeGetInfo, /* nodeGetInfo */ xenProxyNodeGetInfo, /* nodeGetInfo */
xenProxyGetCapabilities, /* getCapabilities */ xenProxyGetCapabilities, /* getCapabilities */
xenProxyListDomains, /* listDomains */ xenProxyListDomains, /* listDomains */

View File

@ -5035,8 +5035,7 @@ static virDriver qemuDriver = {
qemudSupportsFeature, /* supports_feature */ qemudSupportsFeature, /* supports_feature */
qemudGetType, /* type */ qemudGetType, /* type */
qemudGetVersion, /* version */ qemudGetVersion, /* version */
qemudGetHostname, /* hostname */ qemudGetHostname, /* getHostname */
NULL, /* URI */
qemudGetMaxVCPUs, /* getMaxVcpus */ qemudGetMaxVCPUs, /* getMaxVcpus */
qemudGetNodeInfo, /* nodeGetInfo */ qemudGetNodeInfo, /* nodeGetInfo */
qemudGetCapabilities, /* getCapabilities */ qemudGetCapabilities, /* getCapabilities */
@ -5071,8 +5070,8 @@ static virDriver qemuDriver = {
qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */ qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */
qemudNodeGetSecurityModel, /* nodeGetSecurityModel */ qemudNodeGetSecurityModel, /* nodeGetSecurityModel */
qemudDomainDumpXML, /* domainDumpXML */ qemudDomainDumpXML, /* domainDumpXML */
qemudListDefinedDomains, /* listDomains */ qemudListDefinedDomains, /* listDefinedDomains */
qemudNumDefinedDomains, /* numOfDomains */ qemudNumDefinedDomains, /* numOfDefinedDomains */
qemudDomainStart, /* domainCreate */ qemudDomainStart, /* domainCreate */
qemudDomainDefine, /* domainDefineXML */ qemudDomainDefine, /* domainDefineXML */
qemudDomainUndefine, /* domainUndefine */ qemudDomainUndefine, /* domainUndefine */

View File

@ -6837,71 +6837,71 @@ unsigned long remoteVersion(void)
} }
static virDriver driver = { static virDriver driver = {
.no = VIR_DRV_REMOTE, VIR_DRV_REMOTE,
.name = "remote", "remote",
.open = remoteOpen, remoteOpen, /* open */
.close = remoteClose, remoteClose, /* close */
.supports_feature = remoteSupportsFeature, remoteSupportsFeature, /* supports_feature */
.type = remoteType, remoteType, /* type */
.version = remoteGetVersion, remoteGetVersion, /* version */
.getHostname = remoteGetHostname, remoteGetHostname, /* getHostname */
.getMaxVcpus = remoteGetMaxVcpus, remoteGetMaxVcpus, /* getMaxVcpus */
.nodeGetInfo = remoteNodeGetInfo, remoteNodeGetInfo, /* nodeGetInfo */
.getCapabilities = remoteGetCapabilities, remoteGetCapabilities, /* getCapabilities */
.listDomains = remoteListDomains, remoteListDomains, /* listDomains */
.numOfDomains = remoteNumOfDomains, remoteNumOfDomains, /* numOfDomains */
.domainCreateXML = remoteDomainCreateXML, remoteDomainCreateXML, /* domainCreateXML */
.domainLookupByID = remoteDomainLookupByID, remoteDomainLookupByID, /* domainLookupByID */
.domainLookupByUUID = remoteDomainLookupByUUID, remoteDomainLookupByUUID, /* domainLookupByUUID */
.domainLookupByName = remoteDomainLookupByName, remoteDomainLookupByName, /* domainLookupByName */
.domainSuspend = remoteDomainSuspend, remoteDomainSuspend, /* domainSuspend */
.domainResume = remoteDomainResume, remoteDomainResume, /* domainResume */
.domainShutdown = remoteDomainShutdown, remoteDomainShutdown, /* domainShutdown */
.domainReboot = remoteDomainReboot, remoteDomainReboot, /* domainReboot */
.domainDestroy = remoteDomainDestroy, remoteDomainDestroy, /* domainDestroy */
.domainGetOSType = remoteDomainGetOSType, remoteDomainGetOSType, /* domainGetOSType */
.domainGetMaxMemory = remoteDomainGetMaxMemory, remoteDomainGetMaxMemory, /* domainGetMaxMemory */
.domainSetMaxMemory = remoteDomainSetMaxMemory, remoteDomainSetMaxMemory, /* domainSetMaxMemory */
.domainSetMemory = remoteDomainSetMemory, remoteDomainSetMemory, /* domainSetMemory */
.domainGetInfo = remoteDomainGetInfo, remoteDomainGetInfo, /* domainGetInfo */
.domainSave = remoteDomainSave, remoteDomainSave, /* domainSave */
.domainRestore = remoteDomainRestore, remoteDomainRestore, /* domainRestore */
.domainCoreDump = remoteDomainCoreDump, remoteDomainCoreDump, /* domainCoreDump */
.domainSetVcpus = remoteDomainSetVcpus, remoteDomainSetVcpus, /* domainSetVcpus */
.domainPinVcpu = remoteDomainPinVcpu, remoteDomainPinVcpu, /* domainPinVcpu */
.domainGetVcpus = remoteDomainGetVcpus, remoteDomainGetVcpus, /* domainGetVcpus */
.domainGetMaxVcpus = remoteDomainGetMaxVcpus, remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */
.domainGetSecurityLabel = remoteDomainGetSecurityLabel, remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */
.nodeGetSecurityModel = remoteNodeGetSecurityModel, remoteNodeGetSecurityModel, /* nodeGetSecurityModel */
.domainDumpXML = remoteDomainDumpXML, remoteDomainDumpXML, /* domainDumpXML */
.listDefinedDomains = remoteListDefinedDomains, remoteListDefinedDomains, /* listDefinedDomains */
.numOfDefinedDomains = remoteNumOfDefinedDomains, remoteNumOfDefinedDomains, /* numOfDefinedDomains */
.domainCreate = remoteDomainCreate, remoteDomainCreate, /* domainCreate */
.domainDefineXML = remoteDomainDefineXML, remoteDomainDefineXML, /* domainDefineXML */
.domainUndefine = remoteDomainUndefine, remoteDomainUndefine, /* domainUndefine */
.domainAttachDevice = remoteDomainAttachDevice, remoteDomainAttachDevice, /* domainAttachDevice */
.domainDetachDevice = remoteDomainDetachDevice, remoteDomainDetachDevice, /* domainDetachDevice */
.domainGetAutostart = remoteDomainGetAutostart, remoteDomainGetAutostart, /* domainGetAutostart */
.domainSetAutostart = remoteDomainSetAutostart, remoteDomainSetAutostart, /* domainSetAutostart */
.domainGetSchedulerType = remoteDomainGetSchedulerType, remoteDomainGetSchedulerType, /* domainGetSchedulerType */
.domainGetSchedulerParameters = remoteDomainGetSchedulerParameters, remoteDomainGetSchedulerParameters, /* domainGetSchedulerParameters */
.domainSetSchedulerParameters = remoteDomainSetSchedulerParameters, remoteDomainSetSchedulerParameters, /* domainSetSchedulerParameters */
.domainMigratePrepare = remoteDomainMigratePrepare, remoteDomainMigratePrepare, /* domainMigratePrepare */
.domainMigratePerform = remoteDomainMigratePerform, remoteDomainMigratePerform, /* domainMigratePerform */
.domainMigrateFinish = remoteDomainMigrateFinish, remoteDomainMigrateFinish, /* domainMigrateFinish */
.domainBlockStats = remoteDomainBlockStats, remoteDomainBlockStats, /* domainBlockStats */
.domainInterfaceStats = remoteDomainInterfaceStats, remoteDomainInterfaceStats, /* domainInterfaceStats */
.domainBlockPeek = remoteDomainBlockPeek, remoteDomainBlockPeek, /* domainBlockPeek */
.domainMemoryPeek = remoteDomainMemoryPeek, remoteDomainMemoryPeek, /* domainMemoryPeek */
.nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
.getFreeMemory = remoteNodeGetFreeMemory, remoteNodeGetFreeMemory, /* getFreeMemory */
.domainEventRegister = remoteDomainEventRegister, remoteDomainEventRegister, /* domainEventRegister */
.domainEventDeregister = remoteDomainEventDeregister, remoteDomainEventDeregister, /* domainEventDeregister */
.domainMigratePrepare2 = remoteDomainMigratePrepare2, remoteDomainMigratePrepare2, /* domainMigratePrepare2 */
.domainMigrateFinish2 = remoteDomainMigrateFinish2, remoteDomainMigrateFinish2, /* domainMigrateFinish2 */
.nodeDeviceDettach = remoteNodeDeviceDettach, remoteNodeDeviceDettach, /* nodeDeviceDettach */
.nodeDeviceReAttach = remoteNodeDeviceReAttach, remoteNodeDeviceReAttach, /* nodeDeviceReAttach */
.nodeDeviceReset = remoteNodeDeviceReset, remoteNodeDeviceReset, /* nodeDeviceReset */
}; };
static virNetworkDriver network_driver = { static virNetworkDriver network_driver = {

View File

@ -3474,8 +3474,7 @@ static virDriver testDriver = {
NULL, /* supports_feature */ NULL, /* supports_feature */
NULL, /* type */ NULL, /* type */
testGetVersion, /* version */ testGetVersion, /* version */
testGetHostname, /* hostname */ testGetHostname, /* getHostname */
NULL, /* URI */
testGetMaxVCPUs, /* getMaxVcpus */ testGetMaxVCPUs, /* getMaxVcpus */
testNodeGetInfo, /* nodeGetInfo */ testNodeGetInfo, /* nodeGetInfo */
testGetCapabilities, /* getCapabilities */ testGetCapabilities, /* getCapabilities */
@ -3530,7 +3529,7 @@ static virDriver testDriver = {
testDomainEventDeregister, /* domainEventDeregister */ testDomainEventDeregister, /* domainEventDeregister */
NULL, /* domainMigratePrepare2 */ NULL, /* domainMigratePrepare2 */
NULL, /* domainMigrateFinish2 */ NULL, /* domainMigrateFinish2 */
NULL, /* nodeDeviceAttach */ NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */ NULL, /* nodeDeviceReset */
}; };

View File

@ -1829,8 +1829,7 @@ static virDriver umlDriver = {
NULL, /* supports_feature */ NULL, /* supports_feature */
umlGetType, /* type */ umlGetType, /* type */
umlGetVersion, /* version */ umlGetVersion, /* version */
umlGetHostname, /* hostname */ umlGetHostname, /* getHostname */
NULL, /* URI */
NULL, /* getMaxVcpus */ NULL, /* getMaxVcpus */
umlGetNodeInfo, /* nodeGetInfo */ umlGetNodeInfo, /* nodeGetInfo */
umlGetCapabilities, /* getCapabilities */ umlGetCapabilities, /* getCapabilities */
@ -1860,8 +1859,8 @@ static virDriver umlDriver = {
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
umlDomainDumpXML, /* domainDumpXML */ umlDomainDumpXML, /* domainDumpXML */
umlListDefinedDomains, /* listDomains */ umlListDefinedDomains, /* listDefinedDomains */
umlNumDefinedDomains, /* numOfDomains */ umlNumDefinedDomains, /* numOfDefinedDomains */
umlDomainStart, /* domainCreate */ umlDomainStart, /* domainCreate */
umlDomainDefine, /* domainDefineXML */ umlDomainDefine, /* domainDefineXML */
umlDomainUndefine, /* domainUndefine */ umlDomainUndefine, /* domainUndefine */
@ -1887,10 +1886,10 @@ static virDriver umlDriver = {
NULL, /* getFreeMemory */ NULL, /* getFreeMemory */
#endif #endif
NULL, /* domainEventRegister */ NULL, /* domainEventRegister */
NULL, /* domainEventUnregister */ NULL, /* domainEventDeregister */
NULL, /* domainMigratePrepare2 */ NULL, /* domainMigratePrepare2 */
NULL, /* domainMigrateFinish2 */ NULL, /* domainMigrateFinish2 */
NULL, /* nodeDeviceAttach */ NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */ NULL, /* nodeDeviceReset */
}; };

View File

@ -54,7 +54,6 @@ struct xenUnifiedDriver xenInotifyDriver = {
xenInotifyClose, /* close */ xenInotifyClose, /* close */
NULL, /* version */ NULL, /* version */
NULL, /* hostname */ NULL, /* hostname */
NULL, /* URI */
NULL, /* nodeGetInfo */ NULL, /* nodeGetInfo */
NULL, /* getCapabilities */ NULL, /* getCapabilities */
NULL, /* listDomains */ NULL, /* listDomains */

View File

@ -697,7 +697,6 @@ struct xenUnifiedDriver xenHypervisorDriver = {
xenHypervisorClose, /* close */ xenHypervisorClose, /* close */
xenHypervisorGetVersion, /* version */ xenHypervisorGetVersion, /* version */
NULL, /* hostname */ NULL, /* hostname */
NULL, /* URI */
NULL, /* nodeGetInfo */ NULL, /* nodeGetInfo */
xenHypervisorGetCapabilities, /* getCapabilities */ xenHypervisorGetCapabilities, /* getCapabilities */
xenHypervisorListDomains, /* listDomains */ xenHypervisorListDomains, /* listDomains */

View File

@ -1424,63 +1424,71 @@ xenUnifiedDomainEventDeregister (virConnectPtr conn,
/* The interface which we export upwards to libvirt.c. */ /* The interface which we export upwards to libvirt.c. */
static virDriver xenUnifiedDriver = { static virDriver xenUnifiedDriver = {
.no = VIR_DRV_XEN_UNIFIED, VIR_DRV_XEN_UNIFIED,
.name = "Xen", "Xen",
.open = xenUnifiedOpen, xenUnifiedOpen, /* open */
.close = xenUnifiedClose, xenUnifiedClose, /* close */
.supports_feature = xenUnifiedSupportsFeature, xenUnifiedSupportsFeature, /* supports_feature */
.type = xenUnifiedType, xenUnifiedType, /* type */
.version = xenUnifiedGetVersion, xenUnifiedGetVersion, /* version */
.getHostname = xenUnifiedGetHostname, xenUnifiedGetHostname, /* getHostname */
.getMaxVcpus = xenUnifiedGetMaxVcpus, xenUnifiedGetMaxVcpus, /* getMaxVcpus */
.nodeGetInfo = xenUnifiedNodeGetInfo, xenUnifiedNodeGetInfo, /* nodeGetInfo */
.getCapabilities = xenUnifiedGetCapabilities, xenUnifiedGetCapabilities, /* getCapabilities */
.listDomains = xenUnifiedListDomains, xenUnifiedListDomains, /* listDomains */
.numOfDomains = xenUnifiedNumOfDomains, xenUnifiedNumOfDomains, /* numOfDomains */
.domainCreateXML = xenUnifiedDomainCreateXML, xenUnifiedDomainCreateXML, /* domainCreateXML */
.domainLookupByID = xenUnifiedDomainLookupByID, xenUnifiedDomainLookupByID, /* domainLookupByID */
.domainLookupByUUID = xenUnifiedDomainLookupByUUID, xenUnifiedDomainLookupByUUID, /* domainLookupByUUID */
.domainLookupByName = xenUnifiedDomainLookupByName, xenUnifiedDomainLookupByName, /* domainLookupByName */
.domainSuspend = xenUnifiedDomainSuspend, xenUnifiedDomainSuspend, /* domainSuspend */
.domainResume = xenUnifiedDomainResume, xenUnifiedDomainResume, /* domainResume */
.domainShutdown = xenUnifiedDomainShutdown, xenUnifiedDomainShutdown, /* domainShutdown */
.domainReboot = xenUnifiedDomainReboot, xenUnifiedDomainReboot, /* domainReboot */
.domainDestroy = xenUnifiedDomainDestroy, xenUnifiedDomainDestroy, /* domainDestroy */
.domainGetOSType = xenUnifiedDomainGetOSType, xenUnifiedDomainGetOSType, /* domainGetOSType */
.domainGetMaxMemory = xenUnifiedDomainGetMaxMemory, xenUnifiedDomainGetMaxMemory, /* domainGetMaxMemory */
.domainSetMaxMemory = xenUnifiedDomainSetMaxMemory, xenUnifiedDomainSetMaxMemory, /* domainSetMaxMemory */
.domainSetMemory = xenUnifiedDomainSetMemory, xenUnifiedDomainSetMemory, /* domainSetMemory */
.domainGetInfo = xenUnifiedDomainGetInfo, xenUnifiedDomainGetInfo, /* domainGetInfo */
.domainSave = xenUnifiedDomainSave, xenUnifiedDomainSave, /* domainSave */
.domainRestore = xenUnifiedDomainRestore, xenUnifiedDomainRestore, /* domainRestore */
.domainCoreDump = xenUnifiedDomainCoreDump, xenUnifiedDomainCoreDump, /* domainCoreDump */
.domainSetVcpus = xenUnifiedDomainSetVcpus, xenUnifiedDomainSetVcpus, /* domainSetVcpus */
.domainPinVcpu = xenUnifiedDomainPinVcpu, xenUnifiedDomainPinVcpu, /* domainPinVcpu */
.domainGetVcpus = xenUnifiedDomainGetVcpus, xenUnifiedDomainGetVcpus, /* domainGetVcpus */
.domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus, xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */
.domainDumpXML = xenUnifiedDomainDumpXML, NULL, /* domainGetSecurityLabel */
.listDefinedDomains = xenUnifiedListDefinedDomains, NULL, /* nodeGetSecurityModel */
.numOfDefinedDomains = xenUnifiedNumOfDefinedDomains, xenUnifiedDomainDumpXML, /* domainDumpXML */
.domainCreate = xenUnifiedDomainCreate, xenUnifiedListDefinedDomains, /* listDefinedDomains */
.domainDefineXML = xenUnifiedDomainDefineXML, xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */
.domainUndefine = xenUnifiedDomainUndefine, xenUnifiedDomainCreate, /* domainCreate */
.domainAttachDevice = xenUnifiedDomainAttachDevice, xenUnifiedDomainDefineXML, /* domainDefineXML */
.domainDetachDevice = xenUnifiedDomainDetachDevice, xenUnifiedDomainUndefine, /* domainUndefine */
.domainGetAutostart = xenUnifiedDomainGetAutostart, xenUnifiedDomainAttachDevice, /* domainAttachDevice */
.domainSetAutostart = xenUnifiedDomainSetAutostart, xenUnifiedDomainDetachDevice, /* domainDetachDevice */
.domainGetSchedulerType = xenUnifiedDomainGetSchedulerType, xenUnifiedDomainGetAutostart, /* domainGetAutostart */
.domainGetSchedulerParameters = xenUnifiedDomainGetSchedulerParameters, xenUnifiedDomainSetAutostart, /* domainSetAutostart */
.domainSetSchedulerParameters = xenUnifiedDomainSetSchedulerParameters, xenUnifiedDomainGetSchedulerType, /* domainGetSchedulerType */
.domainMigratePrepare = xenUnifiedDomainMigratePrepare, xenUnifiedDomainGetSchedulerParameters, /* domainGetSchedulerParameters */
.domainMigratePerform = xenUnifiedDomainMigratePerform, xenUnifiedDomainSetSchedulerParameters, /* domainSetSchedulerParameters */
.domainMigrateFinish = xenUnifiedDomainMigrateFinish, xenUnifiedDomainMigratePrepare, /* domainMigratePrepare */
.domainBlockStats = xenUnifiedDomainBlockStats, xenUnifiedDomainMigratePerform, /* domainMigratePerform */
.domainInterfaceStats = xenUnifiedDomainInterfaceStats, xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */
.domainBlockPeek = xenUnifiedDomainBlockPeek, xenUnifiedDomainBlockStats, /* domainBlockStats */
.nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory, xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */
.getFreeMemory = xenUnifiedNodeGetFreeMemory, xenUnifiedDomainBlockPeek, /* domainBlockPeek */
.domainEventRegister = xenUnifiedDomainEventRegister, NULL, /* domainMemoryPeek */
.domainEventDeregister = xenUnifiedDomainEventDeregister, xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
xenUnifiedNodeGetFreeMemory, /* getFreeMemory */
xenUnifiedDomainEventRegister, /* domainEventRegister */
xenUnifiedDomainEventDeregister, /* domainEventDeregister */
NULL, /* domainMigratePrepare2 */
NULL, /* domainMigrateFinish2 */
NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */
}; };
/** /**

View File

@ -61,7 +61,6 @@ struct xenUnifiedDriver {
virDrvClose close; virDrvClose close;
virDrvGetVersion version; virDrvGetVersion version;
virDrvGetHostname getHostname; virDrvGetHostname getHostname;
virDrvGetURI getURI;
virDrvNodeGetInfo nodeGetInfo; virDrvNodeGetInfo nodeGetInfo;
virDrvGetCapabilities getCapabilities; virDrvGetCapabilities getCapabilities;
virDrvListDomains listDomains; virDrvListDomains listDomains;

View File

@ -4839,7 +4839,6 @@ struct xenUnifiedDriver xenDaemonDriver = {
xenDaemonClose, /* close */ xenDaemonClose, /* close */
xenDaemonGetVersion, /* version */ xenDaemonGetVersion, /* version */
NULL, /* hostname */ NULL, /* hostname */
NULL, /* URI */
xenDaemonNodeGetInfo, /* nodeGetInfo */ xenDaemonNodeGetInfo, /* nodeGetInfo */
NULL, /* getCapabilities */ NULL, /* getCapabilities */
xenDaemonListDomains, /* listDomains */ xenDaemonListDomains, /* listDomains */

View File

@ -82,7 +82,6 @@ struct xenUnifiedDriver xenXMDriver = {
xenXMClose, /* close */ xenXMClose, /* close */
NULL, /* version */ NULL, /* version */
NULL, /* hostname */ NULL, /* hostname */
NULL, /* URI */
NULL, /* nodeGetInfo */ NULL, /* nodeGetInfo */
NULL, /* getCapabilities */ NULL, /* getCapabilities */
NULL, /* listDomains */ NULL, /* listDomains */

View File

@ -49,7 +49,6 @@ struct xenUnifiedDriver xenStoreDriver = {
xenStoreClose, /* close */ xenStoreClose, /* close */
NULL, /* version */ NULL, /* version */
NULL, /* hostname */ NULL, /* hostname */
NULL, /* URI */
NULL, /* nodeGetInfo */ NULL, /* nodeGetInfo */
NULL, /* getCapabilities */ NULL, /* getCapabilities */
xenStoreListDomains, /* listDomains */ xenStoreListDomains, /* listDomains */