Convert all driver struct intializers to C99 style

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,
This commit is contained in:
Daniel P. Berrange 2011-05-13 11:16:31 +01:00
parent 360df0199e
commit 879d409e9e
20 changed files with 878 additions and 1678 deletions

View File

@ -4632,119 +4632,70 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params,
static virDriver esxDriver = { static virDriver esxDriver = {
VIR_DRV_ESX, .no = VIR_DRV_ESX,
"ESX", .name = "ESX",
esxOpen, /* open */ .open = esxOpen,
esxClose, /* close */ .close = esxClose,
esxSupportsFeature, /* supports_feature */ .supports_feature = esxSupportsFeature,
esxGetType, /* type */ .type = esxGetType,
esxGetVersion, /* version */ .version = esxGetVersion,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .getHostname = esxGetHostname,
esxGetHostname, /* getHostname */ .nodeGetInfo = esxNodeGetInfo,
NULL, /* getSysinfo */ .getCapabilities = esxGetCapabilities,
NULL, /* getMaxVcpus */ .listDomains = esxListDomains,
esxNodeGetInfo, /* nodeGetInfo */ .numOfDomains = esxNumberOfDomains,
esxGetCapabilities, /* getCapabilities */ .domainLookupByID = esxDomainLookupByID,
esxListDomains, /* listDomains */ .domainLookupByUUID = esxDomainLookupByUUID,
esxNumberOfDomains, /* numOfDomains */ .domainLookupByName = esxDomainLookupByName,
NULL, /* domainCreateXML */ .domainSuspend = esxDomainSuspend,
esxDomainLookupByID, /* domainLookupByID */ .domainResume = esxDomainResume,
esxDomainLookupByUUID, /* domainLookupByUUID */ .domainShutdown = esxDomainShutdown,
esxDomainLookupByName, /* domainLookupByName */ .domainReboot = esxDomainReboot,
esxDomainSuspend, /* domainSuspend */ .domainDestroy = esxDomainDestroy,
esxDomainResume, /* domainResume */ .domainGetOSType = esxDomainGetOSType,
esxDomainShutdown, /* domainShutdown */ .domainGetMaxMemory = esxDomainGetMaxMemory,
esxDomainReboot, /* domainReboot */ .domainSetMaxMemory = esxDomainSetMaxMemory,
esxDomainDestroy, /* domainDestroy */ .domainSetMemory = esxDomainSetMemory,
esxDomainGetOSType, /* domainGetOSType */ .domainSetMemoryParameters = esxDomainSetMemoryParameters,
esxDomainGetMaxMemory, /* domainGetMaxMemory */ .domainGetMemoryParameters = esxDomainGetMemoryParameters,
esxDomainSetMaxMemory, /* domainSetMaxMemory */ .domainGetInfo = esxDomainGetInfo,
esxDomainSetMemory, /* domainSetMemory */ .domainGetState = esxDomainGetState,
NULL, /* domainSetMemoryFlags */ .domainSetVcpus = esxDomainSetVcpus,
esxDomainSetMemoryParameters, /* domainSetMemoryParameters */ .domainSetVcpusFlags = esxDomainSetVcpusFlags,
esxDomainGetMemoryParameters, /* domainGetMemoryParameters */ .domainGetVcpusFlags = esxDomainGetVcpusFlags,
NULL, /* domainSetBlkioParameters */ .domainGetMaxVcpus = esxDomainGetMaxVcpus,
NULL, /* domainGetBlkioParameters */ .domainGetXMLDesc = esxDomainGetXMLDesc,
esxDomainGetInfo, /* domainGetInfo */ .domainXMLFromNative = esxDomainXMLFromNative,
esxDomainGetState, /* domainGetState */ .domainXMLToNative = esxDomainXMLToNative,
NULL, /* domainSave */ .listDefinedDomains = esxListDefinedDomains,
NULL, /* domainRestore */ .numOfDefinedDomains = esxNumberOfDefinedDomains,
NULL, /* domainCoreDump */ .domainCreate = esxDomainCreate,
NULL, /* domainScreenshot */ .domainCreateWithFlags = esxDomainCreateWithFlags,
esxDomainSetVcpus, /* domainSetVcpus */ .domainDefineXML = esxDomainDefineXML,
esxDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainUndefine = esxDomainUndefine,
esxDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainGetAutostart = esxDomainGetAutostart,
NULL, /* domainPinVcpu */ .domainSetAutostart = esxDomainSetAutostart,
NULL, /* domainGetVcpus */ .domainGetSchedulerType = esxDomainGetSchedulerType,
esxDomainGetMaxVcpus, /* domainGetMaxVcpus */ .domainGetSchedulerParameters = esxDomainGetSchedulerParameters,
NULL, /* domainGetSecurityLabel */ .domainSetSchedulerParameters = esxDomainSetSchedulerParameters,
NULL, /* nodeGetSecurityModel */ .domainMigratePrepare = esxDomainMigratePrepare,
esxDomainGetXMLDesc, /* domainGetXMLDesc */ .domainMigratePerform = esxDomainMigratePerform,
esxDomainXMLFromNative, /* domainXMLFromNative */ .domainMigrateFinish = esxDomainMigrateFinish,
esxDomainXMLToNative, /* domainXMLToNative */ .nodeGetFreeMemory = esxNodeGetFreeMemory,
esxListDefinedDomains, /* listDefinedDomains */ .isEncrypted = esxIsEncrypted,
esxNumberOfDefinedDomains, /* numOfDefinedDomains */ .isSecure = esxIsSecure,
esxDomainCreate, /* domainCreate */ .domainIsActive = esxDomainIsActive,
esxDomainCreateWithFlags, /* domainCreateWithFlags */ .domainIsPersistent = esxDomainIsPersistent,
esxDomainDefineXML, /* domainDefineXML */ .domainIsUpdated = esxDomainIsUpdated,
esxDomainUndefine, /* domainUndefine */ .domainSnapshotCreateXML = esxDomainSnapshotCreateXML,
NULL, /* domainAttachDevice */ .domainSnapshotGetXMLDesc = esxDomainSnapshotGetXMLDesc,
NULL, /* domainAttachDeviceFlags */ .domainSnapshotNum = esxDomainSnapshotNum,
NULL, /* domainDetachDevice */ .domainSnapshotListNames = esxDomainSnapshotListNames,
NULL, /* domainDetachDeviceFlags */ .domainSnapshotLookupByName = esxDomainSnapshotLookupByName,
NULL, /* domainUpdateDeviceFlags */ .domainHasCurrentSnapshot = esxDomainHasCurrentSnapshot,
esxDomainGetAutostart, /* domainGetAutostart */ .domainSnapshotCurrent = esxDomainSnapshotCurrent,
esxDomainSetAutostart, /* domainSetAutostart */ .domainRevertToSnapshot = esxDomainRevertToSnapshot,
esxDomainGetSchedulerType, /* domainGetSchedulerType */ .domainSnapshotDelete = esxDomainSnapshotDelete,
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 */
}; };

View File

@ -67,20 +67,8 @@ esxInterfaceClose(virConnectPtr conn)
static virInterfaceDriver esxInterfaceDriver = { static virInterfaceDriver esxInterfaceDriver = {
"ESX", /* name */ "ESX", /* name */
esxInterfaceOpen, /* open */ .open = esxInterfaceOpen,
esxInterfaceClose, /* close */ .close = esxInterfaceClose,
NULL, /* numOfInterfaces */
NULL, /* listInterfaces */
NULL, /* numOfDefinedInterfaces */
NULL, /* listDefinedInterfaces */
NULL, /* interfaceLookupByName */
NULL, /* interfaceLookupByMACString */
NULL, /* interfaceGetXMLDesc */
NULL, /* interfaceDefineXML */
NULL, /* interfaceUndefine */
NULL, /* interfaceCreate */
NULL, /* interfaceDestroy */
NULL, /* interfaceIsActive */
}; };

View File

@ -67,25 +67,8 @@ esxNetworkClose(virConnectPtr conn)
static virNetworkDriver esxNetworkDriver = { static virNetworkDriver esxNetworkDriver = {
"ESX", /* name */ "ESX", /* name */
esxNetworkOpen, /* open */ .open = esxNetworkOpen,
esxNetworkClose, /* close */ .close = esxNetworkClose,
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 */
}; };

View File

@ -66,15 +66,8 @@ esxNWFilterClose(virConnectPtr conn)
static virNWFilterDriver esxNWFilterDriver = { static virNWFilterDriver esxNWFilterDriver = {
"ESX", /* name */ "ESX", /* name */
esxNWFilterOpen, /* open */ .open = esxNWFilterOpen,
esxNWFilterClose, /* close */ .close = esxNWFilterClose,
NULL, /* numOfNWFilters */
NULL, /* listNWFilters */
NULL, /* nwfilterLookupByName */
NULL, /* nwfilterLookupByUUID */
NULL, /* defineXML */
NULL, /* undefine */
NULL, /* getXMLDesc */
}; };

View File

@ -65,17 +65,8 @@ esxSecretClose(virConnectPtr conn)
static virSecretDriver esxSecretDriver = { static virSecretDriver esxSecretDriver = {
"ESX", /* name */ "ESX", /* name */
esxSecretOpen, /* open */ .open = esxSecretOpen,
esxSecretClose, /* close */ .close = esxSecretClose,
NULL, /* numOfSecrets */
NULL, /* listSecrets */
NULL, /* lookupByUUID */
NULL, /* lookupByUsage */
NULL, /* defineXML */
NULL, /* getXMLDesc */
NULL, /* setValue */
NULL, /* getValue */
NULL, /* undefine */
}; };

View File

@ -1642,44 +1642,34 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED)
static virStorageDriver esxStorageDriver = { static virStorageDriver esxStorageDriver = {
"ESX", /* name */ "ESX", /* name */
esxStorageOpen, /* open */ .open = esxStorageOpen,
esxStorageClose, /* close */ .close = esxStorageClose,
esxNumberOfStoragePools, /* numOfPools */ .numOfPools = esxNumberOfStoragePools,
esxListStoragePools, /* listPools */ .listPools = esxListStoragePools,
esxNumberOfDefinedStoragePools, /* numOfDefinedPools */ .numOfDefinedPools = esxNumberOfDefinedStoragePools,
esxListDefinedStoragePools, /* listDefinedPools */ .listDefinedPools = esxListDefinedStoragePools,
NULL, /* findPoolSources */ .poolLookupByName = esxStoragePoolLookupByName,
esxStoragePoolLookupByName, /* poolLookupByName */ .poolLookupByUUID = esxStoragePoolLookupByUUID,
esxStoragePoolLookupByUUID, /* poolLookupByUUID */ .poolLookupByVolume = esxStoragePoolLookupByVolume,
esxStoragePoolLookupByVolume, /* poolLookupByVolume */ .poolRefresh = esxStoragePoolRefresh,
NULL, /* poolCreateXML */ .poolGetInfo = esxStoragePoolGetInfo,
NULL, /* poolDefineXML */ .poolGetXMLDesc = esxStoragePoolGetXMLDesc,
NULL, /* poolBuild */ .poolGetAutostart = esxStoragePoolGetAutostart,
NULL, /* poolUndefine */ .poolSetAutostart = esxStoragePoolSetAutostart,
NULL, /* poolCreate */ .poolNumOfVolumes = esxStoragePoolNumberOfStorageVolumes,
NULL, /* poolDestroy */ .poolListVolumes = esxStoragePoolListStorageVolumes,
NULL, /* poolDelete */ .volLookupByName = esxStorageVolumeLookupByName,
esxStoragePoolRefresh, /* poolRefresh */ .volLookupByKey = esxStorageVolumeLookupByKey,
esxStoragePoolGetInfo, /* poolGetInfo */ .volLookupByPath = esxStorageVolumeLookupByPath,
esxStoragePoolGetXMLDesc, /* poolGetXMLDesc */ .volCreateXML = esxStorageVolumeCreateXML,
esxStoragePoolGetAutostart, /* poolGetAutostart */ .volCreateXMLFrom = esxStorageVolumeCreateXMLFrom,
esxStoragePoolSetAutostart, /* poolSetAutostart */ .volDelete = esxStorageVolumeDelete,
esxStoragePoolNumberOfStorageVolumes, /* poolNumOfVolumes */ .volWipe = esxStorageVolumeWipe,
esxStoragePoolListStorageVolumes, /* poolListVolumes */ .volGetInfo = esxStorageVolumeGetInfo,
esxStorageVolumeLookupByName, /* volLookupByName */ .volGetXMLDesc = esxStorageVolumeGetXMLDesc,
esxStorageVolumeLookupByKey, /* volLookupByKey */ .volGetPath = esxStorageVolumeGetPath,
esxStorageVolumeLookupByPath, /* volLookupByPath */ .poolIsActive = esxStoragePoolIsActive,
esxStorageVolumeCreateXML, /* volCreateXML */ .poolIsPersistent = esxStoragePoolIsPersistent,
esxStorageVolumeCreateXMLFrom, /* volCreateXMLFrom */
NULL, /* volDownload */
NULL, /* volUpload */
esxStorageVolumeDelete, /* volDelete */
esxStorageVolumeWipe, /* volWipe */
esxStorageVolumeGetInfo, /* volGetInfo */
esxStorageVolumeGetXMLDesc, /* volGetXMLDesc */
esxStorageVolumeGetPath, /* volGetPath */
esxStoragePoolIsActive, /* poolIsActive */
esxStoragePoolIsPersistent, /* poolIsPersistent */
}; };

View File

@ -542,20 +542,20 @@ cleanup:
static virInterfaceDriver interfaceDriver = { static virInterfaceDriver interfaceDriver = {
"Interface", "Interface",
interfaceOpenInterface, /* open */ .open = interfaceOpenInterface,
interfaceCloseInterface, /* close */ .close = interfaceCloseInterface,
interfaceNumOfInterfaces, /* numOfInterfaces */ .numOfInterfaces = interfaceNumOfInterfaces,
interfaceListInterfaces, /* listInterfaces */ .listInterfaces = interfaceListInterfaces,
interfaceNumOfDefinedInterfaces, /* numOfInterfaces */ .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces,
interfaceListDefinedInterfaces, /* listInterfaces */ .listDefinedInterfaces = interfaceListDefinedInterfaces,
interfaceLookupByName, /* interfaceLookupByName */ .interfaceLookupByName = interfaceLookupByName,
interfaceLookupByMACString, /* interfaceLookupByMACString */ .interfaceLookupByMACString = interfaceLookupByMACString,
interfaceGetXMLDesc, /* interfaceGetXMLDesc */ .interfaceGetXMLDesc = interfaceGetXMLDesc,
interfaceDefineXML, /* interfaceDefineXML */ .interfaceDefineXML = interfaceDefineXML,
interfaceUndefine, /* interfaceUndefine */ .interfaceUndefine = interfaceUndefine,
interfaceCreate, /* interfaceCreate */ .interfaceCreate = interfaceCreate,
interfaceDestroy, /* interfaceDestroy */ .interfaceDestroy = interfaceDestroy,
interfaceIsActive, /* interfaceIsActive */ .interfaceIsActive = interfaceIsActive,
}; };
int interfaceRegister(void) { int interfaceRegister(void) {

View File

@ -2688,119 +2688,60 @@ libxlDomainEventDeregisterAny(virConnectPtr conn, int callbackID)
static virDriver libxlDriver = { static virDriver libxlDriver = {
VIR_DRV_LIBXL, .no = VIR_DRV_LIBXL,
"xenlight", .name = "xenlight",
libxlOpen, /* open */ .open = libxlOpen,
libxlClose, /* close */ .close = libxlClose,
NULL, /* supports_feature */ .type = libxlGetType,
libxlGetType, /* type */ .version = libxlGetVersion,
libxlGetVersion, /* version */ .getHostname = virGetHostname,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .getMaxVcpus = libxlGetMaxVcpus,
virGetHostname, /* getHostname */ .nodeGetInfo = libxlNodeGetInfo,
NULL, /* getSysinfo */ .getCapabilities = libxlGetCapabilities,
libxlGetMaxVcpus, /* getMaxVcpus */ .listDomains = libxlListDomains,
libxlNodeGetInfo, /* nodeGetInfo */ .numOfDomains = libxlNumDomains,
libxlGetCapabilities, /* getCapabilities */ .domainCreateXML = libxlDomainCreateXML,
libxlListDomains, /* listDomains */ .domainLookupByID = libxlDomainLookupByID,
libxlNumDomains, /* numOfDomains */ .domainLookupByUUID = libxlDomainLookupByUUID,
libxlDomainCreateXML, /* domainCreateXML */ .domainLookupByName = libxlDomainLookupByName,
libxlDomainLookupByID, /* domainLookupByID */ .domainSuspend = libxlDomainSuspend,
libxlDomainLookupByUUID, /* domainLookupByUUID */ .domainResume = libxlDomainResume,
libxlDomainLookupByName, /* domainLookupByName */ .domainShutdown = libxlDomainShutdown,
libxlDomainSuspend, /* domainSuspend */ .domainReboot = libxlDomainReboot,
libxlDomainResume, /* domainResume */ .domainDestroy = libxlDomainDestroy,
libxlDomainShutdown, /* domainShutdown */ .domainGetOSType = libxlDomainGetOSType,
libxlDomainReboot, /* domainReboot */ .domainGetMaxMemory = libxlDomainGetMaxMemory,
libxlDomainDestroy, /* domainDestroy */ .domainSetMemory = libxlDomainSetMemory,
libxlDomainGetOSType, /* domainGetOSType */ .domainSetMemoryFlags = libxlDomainSetMemoryFlags,
libxlDomainGetMaxMemory, /* domainGetMaxMemory */ .domainGetInfo = libxlDomainGetInfo,
NULL, /* domainSetMaxMemory */ .domainGetState = libxlDomainGetState,
libxlDomainSetMemory, /* domainSetMemory */ .domainSetVcpus = libxlDomainSetVcpus,
libxlDomainSetMemoryFlags, /* domainSetMemoryFlags */ .domainSetVcpusFlags = libxlDomainSetVcpusFlags,
NULL, /* domainSetMemoryParameters */ .domainGetVcpusFlags = libxlDomainGetVcpusFlags,
NULL, /* domainGetMemoryParameters */ .domainPinVcpu = libxlDomainPinVcpu,
NULL, /* domainSetBlkioParameters */ .domainGetVcpus = libxlDomainGetVcpus,
NULL, /* domainGetBlkioParameters */ .domainGetXMLDesc = libxlDomainGetXMLDesc,
libxlDomainGetInfo, /* domainGetInfo */ .domainXMLFromNative = libxlDomainXMLFromNative,
libxlDomainGetState, /* domainGetState */ .domainXMLToNative = libxlDomainXMLToNative,
NULL, /* domainSave */ .listDefinedDomains = libxlListDefinedDomains,
NULL, /* domainRestore */ .numOfDefinedDomains = libxlNumDefinedDomains,
NULL, /* domainCoreDump */ .domainCreate = libxlDomainCreate,
NULL, /* domainScreenshot */ .domainCreateWithFlags = libxlDomainCreateWithFlags,
libxlDomainSetVcpus, /* domainSetVcpus */ .domainDefineXML = libxlDomainDefineXML,
libxlDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainUndefine = libxlDomainUndefine,
libxlDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainGetAutostart = libxlDomainGetAutostart,
libxlDomainPinVcpu, /* domainPinVcpu */ .domainSetAutostart = libxlDomainSetAutostart,
libxlDomainGetVcpus, /* domainGetVcpus */ .domainGetSchedulerType = libxlDomainGetSchedulerType,
NULL, /* domainGetMaxVcpus */ .domainGetSchedulerParameters = libxlDomainGetSchedulerParameters,
NULL, /* domainGetSecurityLabel */ .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters,
NULL, /* nodeGetSecurityModel */ .nodeGetFreeMemory = libxlNodeGetFreeMemory,
libxlDomainGetXMLDesc, /* domainGetXMLDesc */ .domainEventRegister = libxlDomainEventRegister,
libxlDomainXMLFromNative, /* domainXMLFromNative */ .domainEventDeregister = libxlDomainEventDeregister,
libxlDomainXMLToNative, /* domainXMLToNative */ .domainIsActive = libxlDomainIsActive,
libxlListDefinedDomains, /* listDefinedDomains */ .domainIsPersistent = libxlDomainIsPersistent,
libxlNumDefinedDomains, /* numOfDefinedDomains */ .domainIsUpdated = libxlDomainIsUpdated,
libxlDomainCreate, /* domainCreate */ .domainEventRegisterAny = libxlDomainEventRegisterAny,
libxlDomainCreateWithFlags, /* domainCreateWithFlags */ .domainEventDeregisterAny = libxlDomainEventDeregisterAny,
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 */
}; };
static virStateDriver libxlStateDriver = { static virStateDriver libxlStateDriver = {

View File

@ -2714,119 +2714,56 @@ cleanup:
/* Function Tables */ /* Function Tables */
static virDriver lxcDriver = { static virDriver lxcDriver = {
VIR_DRV_LXC, .no = VIR_DRV_LXC,
"LXC", .name = "LXC",
lxcOpen, /* open */ .open = lxcOpen,
lxcClose, /* close */ .close = lxcClose,
NULL, /* supports_feature */ .version = lxcVersion,
NULL, /* type */ .getHostname = virGetHostname,
lxcVersion, /* version */ .nodeGetInfo = nodeGetInfo,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .getCapabilities = lxcGetCapabilities,
virGetHostname, /* getHostname */ .listDomains = lxcListDomains,
NULL, /* getSysinfo */ .numOfDomains = lxcNumDomains,
NULL, /* getMaxVcpus */ .domainCreateXML = lxcDomainCreateAndStart,
nodeGetInfo, /* nodeGetInfo */ .domainLookupByID = lxcDomainLookupByID,
lxcGetCapabilities, /* getCapabilities */ .domainLookupByUUID = lxcDomainLookupByUUID,
lxcListDomains, /* listDomains */ .domainLookupByName = lxcDomainLookupByName,
lxcNumDomains, /* numOfDomains */ .domainSuspend = lxcDomainSuspend,
lxcDomainCreateAndStart, /* domainCreateXML */ .domainResume = lxcDomainResume,
lxcDomainLookupByID, /* domainLookupByID */ .domainDestroy = lxcDomainDestroy,
lxcDomainLookupByUUID, /* domainLookupByUUID */ .domainGetOSType = lxcGetOSType,
lxcDomainLookupByName, /* domainLookupByName */ .domainGetMaxMemory = lxcDomainGetMaxMemory,
lxcDomainSuspend, /* domainSuspend */ .domainSetMaxMemory = lxcDomainSetMaxMemory,
lxcDomainResume, /* domainResume */ .domainSetMemory = lxcDomainSetMemory,
NULL, /* domainShutdown */ .domainSetMemoryParameters = lxcDomainSetMemoryParameters,
NULL, /* domainReboot */ .domainGetMemoryParameters = lxcDomainGetMemoryParameters,
lxcDomainDestroy, /* domainDestroy */ .domainGetInfo = lxcDomainGetInfo,
lxcGetOSType, /* domainGetOSType */ .domainGetState = lxcDomainGetState,
lxcDomainGetMaxMemory, /* domainGetMaxMemory */ .domainGetXMLDesc = lxcDomainGetXMLDesc,
lxcDomainSetMaxMemory, /* domainSetMaxMemory */ .listDefinedDomains = lxcListDefinedDomains,
lxcDomainSetMemory, /* domainSetMemory */ .numOfDefinedDomains = lxcNumDefinedDomains,
NULL, /* domainSetMemoryFlags */ .domainCreate = lxcDomainStart,
lxcDomainSetMemoryParameters, /* domainSetMemoryParameters */ .domainCreateWithFlags = lxcDomainStartWithFlags,
lxcDomainGetMemoryParameters, /* domainGetMemoryParameters */ .domainDefineXML = lxcDomainDefine,
NULL, /* domainSetBlkioParameters */ .domainUndefine = lxcDomainUndefine,
NULL, /* domainGetBlkioParameters */ .domainGetAutostart = lxcDomainGetAutostart,
lxcDomainGetInfo, /* domainGetInfo */ .domainSetAutostart = lxcDomainSetAutostart,
lxcDomainGetState, /* domainGetState */ .domainGetSchedulerType = lxcGetSchedulerType,
NULL, /* domainSave */ .domainGetSchedulerParameters = lxcGetSchedulerParameters,
NULL, /* domainRestore */ .domainSetSchedulerParameters = lxcSetSchedulerParameters,
NULL, /* domainCoreDump */ .domainInterfaceStats = lxcDomainInterfaceStats,
NULL, /* domainScreenshot */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory,
NULL, /* domainSetVcpus */ .nodeGetFreeMemory = nodeGetFreeMemory,
NULL, /* domainSetVcpusFlags */ .domainEventRegister = lxcDomainEventRegister,
NULL, /* domainGetVcpusFlags */ .domainEventDeregister = lxcDomainEventDeregister,
NULL, /* domainPinVcpu */ .isEncrypted = lxcIsEncrypted,
NULL, /* domainGetVcpus */ .isSecure = lxcIsSecure,
NULL, /* domainGetMaxVcpus */ .domainIsActive = lxcDomainIsActive,
NULL, /* domainGetSecurityLabel */ .domainIsPersistent = lxcDomainIsPersistent,
NULL, /* nodeGetSecurityModel */ .domainIsUpdated = lxcDomainIsUpdated,
lxcDomainGetXMLDesc, /* domainGetXMLDesc */ .domainEventRegisterAny = lxcDomainEventRegisterAny,
NULL, /* domainXMLFromNative */ .domainEventDeregisterAny = lxcDomainEventDeregisterAny,
NULL, /* domainXMLToNative */ .domainOpenConsole = lxcDomainOpenConsole,
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 */
}; };
static virStateDriver lxcStateDriver = { static virStateDriver lxcStateDriver = {

View File

@ -2504,23 +2504,23 @@ cleanup:
static virNetworkDriver networkDriver = { static virNetworkDriver networkDriver = {
"Network", "Network",
networkOpenNetwork, /* open */ .open = networkOpenNetwork,
networkCloseNetwork, /* close */ .close = networkCloseNetwork,
networkNumNetworks, /* numOfNetworks */ .numOfNetworks = networkNumNetworks,
networkListNetworks, /* listNetworks */ .listNetworks = networkListNetworks,
networkNumDefinedNetworks, /* numOfDefinedNetworks */ .numOfDefinedNetworks = networkNumDefinedNetworks,
networkListDefinedNetworks, /* listDefinedNetworks */ .listDefinedNetworks = networkListDefinedNetworks,
networkLookupByUUID, /* networkLookupByUUID */ .networkLookupByUUID = networkLookupByUUID,
networkLookupByName, /* networkLookupByName */ .networkLookupByName = networkLookupByName,
networkCreate, /* networkCreateXML */ .networkCreateXML = networkCreate,
networkDefine, /* networkDefineXML */ .networkDefineXML = networkDefine,
networkUndefine, /* networkUndefine */ .networkUndefine = networkUndefine,
networkStart, /* networkCreate */ .networkCreate = networkStart,
networkDestroy, /* networkDestroy */ .networkDestroy = networkDestroy,
networkGetXMLDesc, /* networkGetXMLDesc */ .networkGetXMLDesc = networkGetXMLDesc,
networkGetBridgeName, /* networkGetBridgeName */ .networkGetBridgeName = networkGetBridgeName,
networkGetAutostart, /* networkGetAutostart */ .networkGetAutostart = networkGetAutostart,
networkSetAutostart, /* networkSetAutostart */ .networkSetAutostart = networkSetAutostart,
networkIsActive, networkIsActive,
networkIsPersistent, networkIsPersistent,
}; };

View File

@ -1577,119 +1577,47 @@ cleanup:
} }
static virDriver openvzDriver = { static virDriver openvzDriver = {
VIR_DRV_OPENVZ, .no = VIR_DRV_OPENVZ,
"OPENVZ", .name = "OPENVZ",
openvzOpen, /* open */ .open = openvzOpen,
openvzClose, /* close */ .close = openvzClose,
NULL, /* supports_feature */ .type = openvzGetType,
openvzGetType, /* type */ .version = openvzGetVersion,
openvzGetVersion, /* version */ .getMaxVcpus = openvzGetMaxVCPUs,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .nodeGetInfo = nodeGetInfo,
NULL, /* getHostname */ .getCapabilities = openvzGetCapabilities,
NULL, /* getSysinfo */ .listDomains = openvzListDomains,
openvzGetMaxVCPUs, /* getMaxVcpus */ .numOfDomains = openvzNumDomains,
nodeGetInfo, /* nodeGetInfo */ .domainCreateXML = openvzDomainCreateXML,
openvzGetCapabilities, /* getCapabilities */ .domainLookupByID = openvzDomainLookupByID,
openvzListDomains, /* listDomains */ .domainLookupByUUID = openvzDomainLookupByUUID,
openvzNumDomains, /* numOfDomains */ .domainLookupByName = openvzDomainLookupByName,
openvzDomainCreateXML, /* domainCreateXML */ .domainSuspend = openvzDomainSuspend,
openvzDomainLookupByID, /* domainLookupByID */ .domainResume = openvzDomainResume,
openvzDomainLookupByUUID, /* domainLookupByUUID */ .domainShutdown = openvzDomainShutdown,
openvzDomainLookupByName, /* domainLookupByName */ .domainReboot = openvzDomainReboot,
openvzDomainSuspend, /* domainSuspend */ .domainDestroy = openvzDomainShutdown,
openvzDomainResume, /* domainResume */ .domainGetOSType = openvzGetOSType,
openvzDomainShutdown, /* domainShutdown */ .domainGetInfo = openvzDomainGetInfo,
openvzDomainReboot, /* domainReboot */ .domainGetState = openvzDomainGetState,
openvzDomainShutdown, /* domainDestroy */ .domainSetVcpus = openvzDomainSetVcpus,
openvzGetOSType, /* domainGetOSType */ .domainSetVcpusFlags = openvzDomainSetVcpusFlags,
NULL, /* domainGetMaxMemory */ .domainGetVcpusFlags = openvzDomainGetVcpusFlags,
NULL, /* domainSetMaxMemory */ .domainGetMaxVcpus = openvzDomainGetMaxVcpus,
NULL, /* domainSetMemory */ .domainGetXMLDesc = openvzDomainGetXMLDesc,
NULL, /* domainSetMemoryFlags */ .listDefinedDomains = openvzListDefinedDomains,
NULL, /* domainSetMemoryParameters */ .numOfDefinedDomains = openvzNumDefinedDomains,
NULL, /* domainGetMemoryParameters */ .domainCreate = openvzDomainCreate,
NULL, /* domainSetBlkioParameters */ .domainCreateWithFlags = openvzDomainCreateWithFlags,
NULL, /* domainGetBlkioParameters */ .domainDefineXML = openvzDomainDefineXML,
openvzDomainGetInfo, /* domainGetInfo */ .domainUndefine = openvzDomainUndefine,
openvzDomainGetState, /* domainGetState */ .domainGetAutostart = openvzDomainGetAutostart,
NULL, /* domainSave */ .domainSetAutostart = openvzDomainSetAutostart,
NULL, /* domainRestore */ .isEncrypted = openvzIsEncrypted,
NULL, /* domainCoreDump */ .isSecure = openvzIsSecure,
NULL, /* domainScreenshot */ .domainIsActive = openvzDomainIsActive,
openvzDomainSetVcpus, /* domainSetVcpus */ .domainIsPersistent = openvzDomainIsPersistent,
openvzDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainIsUpdated = openvzDomainIsUpdated,
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 */
}; };
int openvzRegister(void) { int openvzRegister(void) {

View File

@ -3740,117 +3740,33 @@ phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED)
} }
static virDriver phypDriver = { static virDriver phypDriver = {
VIR_DRV_PHYP, "PHYP", phypOpen, /* open */ .no = VIR_DRV_PHYP,
phypClose, /* close */ .name = "PHYP",
NULL, /* supports_feature */ .open = phypOpen,
NULL, /* type */ .close = phypClose,
NULL, /* version */ .getCapabilities = phypConnectGetCapabilities,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .listDomains = phypListDomains,
NULL, /* getHostname */ .numOfDomains = phypNumDomains,
NULL, /* getSysinfo */ .domainCreateXML = phypDomainCreateAndStart,
NULL, /* getMaxVcpus */ .domainLookupByID = phypDomainLookupByID,
NULL, /* nodeGetInfo */ .domainLookupByName = phypDomainLookupByName,
phypConnectGetCapabilities, /* getCapabilities */ .domainResume = phypDomainResume,
phypListDomains, /* listDomains */ .domainShutdown = phypDomainShutdown,
phypNumDomains, /* numOfDomains */ .domainReboot = phypDomainReboot,
phypDomainCreateAndStart, /* domainCreateXML */ .domainDestroy = phypDomainDestroy,
phypDomainLookupByID, /* domainLookupByID */ .domainGetInfo = phypDomainGetInfo,
NULL, /* domainLookupByUUID */ .domainGetState = phypDomainGetState,
phypDomainLookupByName, /* domainLookupByName */ .domainSetVcpus = phypDomainSetCPU,
NULL, /* domainSuspend */ .domainSetVcpusFlags = phypDomainSetVcpusFlags,
phypDomainResume, /* domainResume */ .domainGetVcpusFlags = phypDomainGetVcpusFlags,
phypDomainShutdown, /* domainShutdown */ .domainGetMaxVcpus = phypGetLparCPUMAX,
phypDomainReboot, /* domainReboot */ .domainGetXMLDesc = phypDomainGetXMLDesc,
phypDomainDestroy, /* domainDestroy */ .listDefinedDomains = phypListDefinedDomains,
NULL, /* domainGetOSType */ .numOfDefinedDomains = phypNumDefinedDomains,
NULL, /* domainGetMaxMemory */ .domainAttachDevice = phypAttachDevice,
NULL, /* domainSetMaxMemory */ .isEncrypted = phypIsEncrypted,
NULL, /* domainSetMemory */ .isSecure = phypIsSecure,
NULL, /* domainSetMemoryFlags */ .domainIsUpdated = phypIsUpdated,
NULL, /* domainSetMemoryParameters */
NULL, /* domainGetMemoryParameters */
NULL, /* domainSetBlkioParameters */
NULL, /* domainGetBlkioParameters */
phypDomainGetInfo, /* domainGetInfo */
phypDomainGetState, /* domainGetState */
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 */
}; };
static virStorageDriver phypStorageDriver = { static virStorageDriver phypStorageDriver = {
@ -3860,38 +3776,19 @@ static virStorageDriver phypStorageDriver = {
.numOfPools = phypNumOfStoragePools, .numOfPools = phypNumOfStoragePools,
.listPools = phypListStoragePools, .listPools = phypListStoragePools,
.numOfDefinedPools = NULL,
.listDefinedPools = NULL,
.findPoolSources = NULL,
.poolLookupByName = phypStoragePoolLookupByName, .poolLookupByName = phypStoragePoolLookupByName,
.poolLookupByUUID = phypGetStoragePoolLookUpByUUID, .poolLookupByUUID = phypGetStoragePoolLookUpByUUID,
.poolLookupByVolume = NULL,
.poolCreateXML = phypStoragePoolCreateXML, .poolCreateXML = phypStoragePoolCreateXML,
.poolDefineXML = NULL,
.poolBuild = NULL,
.poolUndefine = NULL,
.poolCreate = NULL,
.poolDestroy = phypDestroyStoragePool, .poolDestroy = phypDestroyStoragePool,
.poolDelete = NULL,
.poolRefresh = NULL,
.poolGetInfo = NULL,
.poolGetXMLDesc = phypGetStoragePoolXMLDesc, .poolGetXMLDesc = phypGetStoragePoolXMLDesc,
.poolGetAutostart = NULL,
.poolSetAutostart = NULL,
.poolNumOfVolumes = phypStoragePoolNumOfVolumes, .poolNumOfVolumes = phypStoragePoolNumOfVolumes,
.poolListVolumes = phypStoragePoolListVolumes, .poolListVolumes = phypStoragePoolListVolumes,
.volLookupByName = phypVolumeLookupByName, .volLookupByName = phypVolumeLookupByName,
.volLookupByKey = NULL,
.volLookupByPath = phypVolumeLookupByPath, .volLookupByPath = phypVolumeLookupByPath,
.volCreateXML = phypStorageVolCreateXML, .volCreateXML = phypStorageVolCreateXML,
.volCreateXMLFrom = NULL,
.volDelete = NULL,
.volGetInfo = NULL,
.volGetXMLDesc = phypVolumeGetXMLDesc, .volGetXMLDesc = phypVolumeGetXMLDesc,
.volGetPath = phypVolumeGetPath, .volGetPath = phypVolumeGetPath,
.poolIsActive = NULL,
.poolIsPersistent = NULL
}; };
static virInterfaceDriver phypInterfaceDriver = { static virInterfaceDriver phypInterfaceDriver = {
@ -3900,14 +3797,8 @@ static virInterfaceDriver phypInterfaceDriver = {
.close = phypVIOSDriverClose, .close = phypVIOSDriverClose,
.numOfInterfaces = phypNumOfInterfaces, .numOfInterfaces = phypNumOfInterfaces,
.listInterfaces = phypListInterfaces, .listInterfaces = phypListInterfaces,
.numOfDefinedInterfaces = NULL,
.listDefinedInterfaces = NULL,
.interfaceLookupByName = phypInterfaceLookupByName, .interfaceLookupByName = phypInterfaceLookupByName,
.interfaceLookupByMACString = NULL,
.interfaceGetXMLDesc = NULL,
.interfaceDefineXML = phypInterfaceDefineXML, .interfaceDefineXML = phypInterfaceDefineXML,
.interfaceUndefine = NULL,
.interfaceCreate = NULL,
.interfaceDestroy = phypInterfaceDestroy, .interfaceDestroy = phypInterfaceDestroy,
.interfaceIsActive = phypInterfaceIsActive .interfaceIsActive = phypInterfaceIsActive
}; };

View File

@ -7254,119 +7254,115 @@ cleanup:
static virDriver qemuDriver = { static virDriver qemuDriver = {
VIR_DRV_QEMU, .no = VIR_DRV_QEMU,
"QEMU", .name = "QEMU",
qemudOpen, /* open */ .open = qemudOpen,
qemudClose, /* close */ .close = qemudClose,
qemudSupportsFeature, /* supports_feature */ .supports_feature = qemudSupportsFeature,
qemudGetType, /* type */ .type = qemudGetType,
qemudGetVersion, /* version */ .version = qemudGetVersion,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .getHostname = virGetHostname,
virGetHostname, /* getHostname */ .getSysinfo = qemuGetSysinfo,
qemuGetSysinfo, /* getSysinfo */ .getMaxVcpus = qemudGetMaxVCPUs,
qemudGetMaxVCPUs, /* getMaxVcpus */ .nodeGetInfo = nodeGetInfo,
nodeGetInfo, /* nodeGetInfo */ .getCapabilities = qemudGetCapabilities,
qemudGetCapabilities, /* getCapabilities */ .listDomains = qemudListDomains,
qemudListDomains, /* listDomains */ .numOfDomains = qemudNumDomains,
qemudNumDomains, /* numOfDomains */ .domainCreateXML = qemudDomainCreate,
qemudDomainCreate, /* domainCreateXML */ .domainLookupByID = qemudDomainLookupByID,
qemudDomainLookupByID, /* domainLookupByID */ .domainLookupByUUID = qemudDomainLookupByUUID,
qemudDomainLookupByUUID, /* domainLookupByUUID */ .domainLookupByName = qemudDomainLookupByName,
qemudDomainLookupByName, /* domainLookupByName */ .domainSuspend = qemudDomainSuspend,
qemudDomainSuspend, /* domainSuspend */ .domainResume = qemudDomainResume,
qemudDomainResume, /* domainResume */ .domainShutdown = qemudDomainShutdown,
qemudDomainShutdown, /* domainShutdown */ .domainDestroy = qemudDomainDestroy,
NULL, /* domainReboot */ .domainGetOSType = qemudDomainGetOSType,
qemudDomainDestroy, /* domainDestroy */ .domainGetMaxMemory = qemudDomainGetMaxMemory,
qemudDomainGetOSType, /* domainGetOSType */ .domainSetMaxMemory = qemudDomainSetMaxMemory,
qemudDomainGetMaxMemory, /* domainGetMaxMemory */ .domainSetMemory = qemudDomainSetMemory,
qemudDomainSetMaxMemory, /* domainSetMaxMemory */ .domainSetMemoryFlags = qemudDomainSetMemoryFlags,
qemudDomainSetMemory, /* domainSetMemory */ .domainSetMemoryParameters = qemuDomainSetMemoryParameters,
qemudDomainSetMemoryFlags, /* domainSetMemoryFlags */ .domainGetMemoryParameters = qemuDomainGetMemoryParameters,
qemuDomainSetMemoryParameters, /* domainSetMemoryParameters */ .domainSetBlkioParameters = qemuDomainSetBlkioParameters,
qemuDomainGetMemoryParameters, /* domainGetMemoryParameters */ .domainGetBlkioParameters = qemuDomainGetBlkioParameters,
qemuDomainSetBlkioParameters, /* domainSetBlkioParameters */ .domainGetInfo = qemudDomainGetInfo,
qemuDomainGetBlkioParameters, /* domainGetBlkioParameters */ .domainGetState = qemuDomainGetState,
qemudDomainGetInfo, /* domainGetInfo */ .domainSave = qemudDomainSave,
qemuDomainGetState, /* domainGetState */ .domainRestore = qemuDomainRestore,
qemudDomainSave, /* domainSave */ .domainCoreDump = qemudDomainCoreDump,
qemuDomainRestore, /* domainRestore */ .domainScreenshot = qemuDomainScreenshot,
qemudDomainCoreDump, /* domainCoreDump */ .domainSetVcpus = qemudDomainSetVcpus,
qemuDomainScreenshot, /* domainScreenshot */ .domainSetVcpusFlags = qemudDomainSetVcpusFlags,
qemudDomainSetVcpus, /* domainSetVcpus */ .domainGetVcpusFlags = qemudDomainGetVcpusFlags,
qemudDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainPinVcpu = qemudDomainPinVcpu,
qemudDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainGetVcpus = qemudDomainGetVcpus,
qemudDomainPinVcpu, /* domainPinVcpu */ .domainGetMaxVcpus = qemudDomainGetMaxVcpus,
qemudDomainGetVcpus, /* domainGetVcpus */ .domainGetSecurityLabel = qemudDomainGetSecurityLabel,
qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */ .nodeGetSecurityModel = qemudNodeGetSecurityModel,
qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */ .domainGetXMLDesc = qemuDomainGetXMLDesc,
qemudNodeGetSecurityModel, /* nodeGetSecurityModel */ .domainXMLFromNative = qemuDomainXMLFromNative,
qemuDomainGetXMLDesc, /* domainGetXMLDesc */ .domainXMLToNative = qemuDomainXMLToNative,
qemuDomainXMLFromNative, /* domainXMLFromNative */ .listDefinedDomains = qemudListDefinedDomains,
qemuDomainXMLToNative, /* domainXMLToNative */ .numOfDefinedDomains = qemudNumDefinedDomains,
qemudListDefinedDomains, /* listDefinedDomains */ .domainCreate = qemudDomainStart,
qemudNumDefinedDomains, /* numOfDefinedDomains */ .domainCreateWithFlags = qemudDomainStartWithFlags,
qemudDomainStart, /* domainCreate */ .domainDefineXML = qemudDomainDefine,
qemudDomainStartWithFlags, /* domainCreateWithFlags */ .domainUndefine = qemudDomainUndefine,
qemudDomainDefine, /* domainDefineXML */ .domainAttachDevice = qemuDomainAttachDevice,
qemudDomainUndefine, /* domainUndefine */ .domainAttachDeviceFlags = qemuDomainAttachDeviceFlags,
qemuDomainAttachDevice, /* domainAttachDevice */ .domainDetachDevice = qemuDomainDetachDevice,
qemuDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ .domainDetachDeviceFlags = qemuDomainDetachDeviceFlags,
qemuDomainDetachDevice, /* domainDetachDevice */ .domainUpdateDeviceFlags = qemuDomainUpdateDeviceFlags,
qemuDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ .domainGetAutostart = qemudDomainGetAutostart,
qemuDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ .domainSetAutostart = qemudDomainSetAutostart,
qemudDomainGetAutostart, /* domainGetAutostart */ .domainGetSchedulerType = qemuGetSchedulerType,
qemudDomainSetAutostart, /* domainSetAutostart */ .domainGetSchedulerParameters = qemuGetSchedulerParameters,
qemuGetSchedulerType, /* domainGetSchedulerType */ .domainSetSchedulerParameters = qemuSetSchedulerParameters,
qemuGetSchedulerParameters, /* domainGetSchedulerParameters */ .domainMigratePerform = qemudDomainMigratePerform,
qemuSetSchedulerParameters, /* domainSetSchedulerParameters */ .domainBlockStats = qemudDomainBlockStats,
NULL, /* domainMigratePrepare (v1) */ .domainInterfaceStats = qemudDomainInterfaceStats,
qemudDomainMigratePerform, /* domainMigratePerform */ .domainMemoryStats = qemudDomainMemoryStats,
NULL, /* domainMigrateFinish */ .domainBlockPeek = qemudDomainBlockPeek,
qemudDomainBlockStats, /* domainBlockStats */ .domainMemoryPeek = qemudDomainMemoryPeek,
qemudDomainInterfaceStats, /* domainInterfaceStats */ .domainGetBlockInfo = qemuDomainGetBlockInfo,
qemudDomainMemoryStats, /* domainMemoryStats */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory,
qemudDomainBlockPeek, /* domainBlockPeek */ .nodeGetFreeMemory = nodeGetFreeMemory,
qemudDomainMemoryPeek, /* domainMemoryPeek */ .domainEventRegister = qemuDomainEventRegister,
qemuDomainGetBlockInfo, /* domainGetBlockInfo */ .domainEventDeregister = qemuDomainEventDeregister,
nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ .domainMigratePrepare2 = qemudDomainMigratePrepare2,
nodeGetFreeMemory, /* nodeGetFreeMemory */ .domainMigrateFinish2 = qemudDomainMigrateFinish2,
qemuDomainEventRegister, /* domainEventRegister */ .nodeDeviceDettach = qemudNodeDeviceDettach,
qemuDomainEventDeregister, /* domainEventDeregister */ .nodeDeviceReAttach = qemudNodeDeviceReAttach,
qemudDomainMigratePrepare2, /* domainMigratePrepare2 */ .nodeDeviceReset = qemudNodeDeviceReset,
qemudDomainMigrateFinish2, /* domainMigrateFinish2 */ .domainMigratePrepareTunnel = qemudDomainMigratePrepareTunnel,
qemudNodeDeviceDettach, /* nodeDeviceDettach */ .isEncrypted = qemuIsEncrypted,
qemudNodeDeviceReAttach, /* nodeDeviceReAttach */ .isSecure = qemuIsSecure,
qemudNodeDeviceReset, /* nodeDeviceReset */ .domainIsActive = qemuDomainIsActive,
qemudDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ .domainIsPersistent = qemuDomainIsPersistent,
qemuIsEncrypted, /* isEncrypted */ .domainIsUpdated = qemuDomainIsUpdated,
qemuIsSecure, /* isSecure */ .cpuCompare = qemuCPUCompare,
qemuDomainIsActive, /* domainIsActive */ .cpuBaseline = qemuCPUBaseline,
qemuDomainIsPersistent, /* domainIsPersistent */ .domainGetJobInfo = qemuDomainGetJobInfo,
qemuDomainIsUpdated, /* domainIsUpdated */ .domainAbortJob = qemuDomainAbortJob,
qemuCPUCompare, /* cpuCompare */ .domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime,
qemuCPUBaseline, /* cpuBaseline */ .domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed,
qemuDomainGetJobInfo, /* domainGetJobInfo */ .domainEventRegisterAny = qemuDomainEventRegisterAny,
qemuDomainAbortJob, /* domainAbortJob */ .domainEventDeregisterAny = qemuDomainEventDeregisterAny,
qemuDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */ .domainManagedSave = qemuDomainManagedSave,
qemuDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */ .domainHasManagedSaveImage = qemuDomainHasManagedSaveImage,
qemuDomainEventRegisterAny, /* domainEventRegisterAny */ .domainManagedSaveRemove = qemuDomainManagedSaveRemove,
qemuDomainEventDeregisterAny, /* domainEventDeregisterAny */ .domainSnapshotCreateXML = qemuDomainSnapshotCreateXML,
qemuDomainManagedSave, /* domainManagedSave */ .domainSnapshotGetXMLDesc = qemuDomainSnapshotGetXMLDesc,
qemuDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ .domainSnapshotNum = qemuDomainSnapshotNum,
qemuDomainManagedSaveRemove, /* domainManagedSaveRemove */ .domainSnapshotListNames = qemuDomainSnapshotListNames,
qemuDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ .domainSnapshotLookupByName = qemuDomainSnapshotLookupByName,
qemuDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ .domainHasCurrentSnapshot = qemuDomainHasCurrentSnapshot,
qemuDomainSnapshotNum, /* domainSnapshotNum */ .domainSnapshotCurrent = qemuDomainSnapshotCurrent,
qemuDomainSnapshotListNames, /* domainSnapshotListNames */ .domainRevertToSnapshot = qemuDomainRevertToSnapshot,
qemuDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ .domainSnapshotDelete = qemuDomainSnapshotDelete,
qemuDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ .qemuDomainMonitorCommand = qemuDomainMonitorCommand,
qemuDomainSnapshotCurrent, /* domainSnapshotCurrent */ .domainOpenConsole = qemuDomainOpenConsole,
qemuDomainRevertToSnapshot, /* domainRevertToSnapshot */ .domainInjectNMI = qemuDomainInjectNMI,
qemuDomainSnapshotDelete, /* domainSnapshotDelete */
qemuDomainMonitorCommand, /* qemuDomainMonitorCommand */
qemuDomainOpenConsole, /* domainOpenConsole */
qemuDomainInjectNMI, /* domainInjectNMI */
}; };

View File

@ -6397,119 +6397,119 @@ unsigned long remoteVersion(void)
} }
static virDriver remote_driver = { static virDriver remote_driver = {
VIR_DRV_REMOTE, .no = VIR_DRV_REMOTE,
"remote", .name = "remote",
remoteOpen, /* open */ .open = remoteOpen,
remoteClose, /* close */ .close = remoteClose,
remoteSupportsFeature, /* supports_feature */ .supports_feature = remoteSupportsFeature,
remoteType, /* type */ .type = remoteType,
remoteGetVersion, /* version */ .version = remoteGetVersion,
remoteGetLibVersion, /* libvirtVersion */ .libvirtVersion = remoteGetLibVersion,
remoteGetHostname, /* getHostname */ .getHostname = remoteGetHostname,
remoteGetSysinfo, /* getSysinfo */ .getSysinfo = remoteGetSysinfo,
remoteGetMaxVcpus, /* getMaxVcpus */ .getMaxVcpus = remoteGetMaxVcpus,
remoteNodeGetInfo, /* nodeGetInfo */ .nodeGetInfo = remoteNodeGetInfo,
remoteGetCapabilities, /* getCapabilities */ .getCapabilities = remoteGetCapabilities,
remoteListDomains, /* listDomains */ .listDomains = remoteListDomains,
remoteNumOfDomains, /* numOfDomains */ .numOfDomains = remoteNumOfDomains,
remoteDomainCreateXML, /* domainCreateXML */ .domainCreateXML = remoteDomainCreateXML,
remoteDomainLookupByID, /* domainLookupByID */ .domainLookupByID = remoteDomainLookupByID,
remoteDomainLookupByUUID, /* domainLookupByUUID */ .domainLookupByUUID = remoteDomainLookupByUUID,
remoteDomainLookupByName, /* domainLookupByName */ .domainLookupByName = remoteDomainLookupByName,
remoteDomainSuspend, /* domainSuspend */ .domainSuspend = remoteDomainSuspend,
remoteDomainResume, /* domainResume */ .domainResume = remoteDomainResume,
remoteDomainShutdown, /* domainShutdown */ .domainShutdown = remoteDomainShutdown,
remoteDomainReboot, /* domainReboot */ .domainReboot = remoteDomainReboot,
remoteDomainDestroy, /* domainDestroy */ .domainDestroy = remoteDomainDestroy,
remoteDomainGetOSType, /* domainGetOSType */ .domainGetOSType = remoteDomainGetOSType,
remoteDomainGetMaxMemory, /* domainGetMaxMemory */ .domainGetMaxMemory = remoteDomainGetMaxMemory,
remoteDomainSetMaxMemory, /* domainSetMaxMemory */ .domainSetMaxMemory = remoteDomainSetMaxMemory,
remoteDomainSetMemory, /* domainSetMemory */ .domainSetMemory = remoteDomainSetMemory,
remoteDomainSetMemoryFlags, /* domainSetMemoryFlags */ .domainSetMemoryFlags = remoteDomainSetMemoryFlags,
remoteDomainSetMemoryParameters, /* domainSetMemoryParameters */ .domainSetMemoryParameters = remoteDomainSetMemoryParameters,
remoteDomainGetMemoryParameters, /* domainGetMemoryParameters */ .domainGetMemoryParameters = remoteDomainGetMemoryParameters,
remoteDomainSetBlkioParameters, /* domainSetBlkioParameters */ .domainSetBlkioParameters = remoteDomainSetBlkioParameters,
remoteDomainGetBlkioParameters, /* domainGetBlkioParameters */ .domainGetBlkioParameters = remoteDomainGetBlkioParameters,
remoteDomainGetInfo, /* domainGetInfo */ .domainGetInfo = remoteDomainGetInfo,
remoteDomainGetState, /* domainGetState */ .domainGetState = remoteDomainGetState,
remoteDomainSave, /* domainSave */ .domainSave = remoteDomainSave,
remoteDomainRestore, /* domainRestore */ .domainRestore = remoteDomainRestore,
remoteDomainCoreDump, /* domainCoreDump */ .domainCoreDump = remoteDomainCoreDump,
remoteDomainScreenshot, /* domainScreenshot */ .domainScreenshot = remoteDomainScreenshot,
remoteDomainSetVcpus, /* domainSetVcpus */ .domainSetVcpus = remoteDomainSetVcpus,
remoteDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainSetVcpusFlags = remoteDomainSetVcpusFlags,
remoteDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainGetVcpusFlags = remoteDomainGetVcpusFlags,
remoteDomainPinVcpu, /* domainPinVcpu */ .domainPinVcpu = remoteDomainPinVcpu,
remoteDomainGetVcpus, /* domainGetVcpus */ .domainGetVcpus = remoteDomainGetVcpus,
remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */ .domainGetMaxVcpus = remoteDomainGetMaxVcpus,
remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */ .domainGetSecurityLabel = remoteDomainGetSecurityLabel,
remoteNodeGetSecurityModel, /* nodeGetSecurityModel */ .nodeGetSecurityModel = remoteNodeGetSecurityModel,
remoteDomainGetXMLDesc, /* domainGetXMLDesc */ .domainGetXMLDesc = remoteDomainGetXMLDesc,
remoteDomainXMLFromNative, /* domainXMLFromNative */ .domainXMLFromNative = remoteDomainXMLFromNative,
remoteDomainXMLToNative, /* domainXMLToNative */ .domainXMLToNative = remoteDomainXMLToNative,
remoteListDefinedDomains, /* listDefinedDomains */ .listDefinedDomains = remoteListDefinedDomains,
remoteNumOfDefinedDomains, /* numOfDefinedDomains */ .numOfDefinedDomains = remoteNumOfDefinedDomains,
remoteDomainCreate, /* domainCreate */ .domainCreate = remoteDomainCreate,
remoteDomainCreateWithFlags, /* domainCreateWithFlags */ .domainCreateWithFlags = remoteDomainCreateWithFlags,
remoteDomainDefineXML, /* domainDefineXML */ .domainDefineXML = remoteDomainDefineXML,
remoteDomainUndefine, /* domainUndefine */ .domainUndefine = remoteDomainUndefine,
remoteDomainAttachDevice, /* domainAttachDevice */ .domainAttachDevice = remoteDomainAttachDevice,
remoteDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ .domainAttachDeviceFlags = remoteDomainAttachDeviceFlags,
remoteDomainDetachDevice, /* domainDetachDevice */ .domainDetachDevice = remoteDomainDetachDevice,
remoteDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ .domainDetachDeviceFlags = remoteDomainDetachDeviceFlags,
remoteDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ .domainUpdateDeviceFlags = remoteDomainUpdateDeviceFlags,
remoteDomainGetAutostart, /* domainGetAutostart */ .domainGetAutostart = remoteDomainGetAutostart,
remoteDomainSetAutostart, /* domainSetAutostart */ .domainSetAutostart = remoteDomainSetAutostart,
remoteDomainGetSchedulerType, /* domainGetSchedulerType */ .domainGetSchedulerType = remoteDomainGetSchedulerType,
remoteDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ .domainGetSchedulerParameters = remoteDomainGetSchedulerParameters,
remoteDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ .domainSetSchedulerParameters = remoteDomainSetSchedulerParameters,
remoteDomainMigratePrepare, /* domainMigratePrepare */ .domainMigratePrepare = remoteDomainMigratePrepare,
remoteDomainMigratePerform, /* domainMigratePerform */ .domainMigratePerform = remoteDomainMigratePerform,
remoteDomainMigrateFinish, /* domainMigrateFinish */ .domainMigrateFinish = remoteDomainMigrateFinish,
remoteDomainBlockStats, /* domainBlockStats */ .domainBlockStats = remoteDomainBlockStats,
remoteDomainInterfaceStats, /* domainInterfaceStats */ .domainInterfaceStats = remoteDomainInterfaceStats,
remoteDomainMemoryStats, /* domainMemoryStats */ .domainMemoryStats = remoteDomainMemoryStats,
remoteDomainBlockPeek, /* domainBlockPeek */ .domainBlockPeek = remoteDomainBlockPeek,
remoteDomainMemoryPeek, /* domainMemoryPeek */ .domainMemoryPeek = remoteDomainMemoryPeek,
remoteDomainGetBlockInfo, /* domainGetBlockInfo */ .domainGetBlockInfo = remoteDomainGetBlockInfo,
remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory,
remoteNodeGetFreeMemory, /* nodeGetFreeMemory */ .nodeGetFreeMemory = remoteNodeGetFreeMemory,
remoteDomainEventRegister, /* domainEventRegister */ .domainEventRegister = remoteDomainEventRegister,
remoteDomainEventDeregister, /* domainEventDeregister */ .domainEventDeregister = remoteDomainEventDeregister,
remoteDomainMigratePrepare2, /* domainMigratePrepare2 */ .domainMigratePrepare2 = remoteDomainMigratePrepare2,
remoteDomainMigrateFinish2, /* domainMigrateFinish2 */ .domainMigrateFinish2 = remoteDomainMigrateFinish2,
remoteNodeDeviceDettach, /* nodeDeviceDettach */ .nodeDeviceDettach = remoteNodeDeviceDettach,
remoteNodeDeviceReAttach, /* nodeDeviceReAttach */ .nodeDeviceReAttach = remoteNodeDeviceReAttach,
remoteNodeDeviceReset, /* nodeDeviceReset */ .nodeDeviceReset = remoteNodeDeviceReset,
remoteDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel,
remoteIsEncrypted, /* isEncrypted */ .isEncrypted = remoteIsEncrypted,
remoteIsSecure, /* isSecure */ .isSecure = remoteIsSecure,
remoteDomainIsActive, /* domainIsActive */ .domainIsActive = remoteDomainIsActive,
remoteDomainIsPersistent, /* domainIsPersistent */ .domainIsPersistent = remoteDomainIsPersistent,
remoteDomainIsUpdated, /* domainIsUpdated */ .domainIsUpdated = remoteDomainIsUpdated,
remoteCPUCompare, /* cpuCompare */ .cpuCompare = remoteCPUCompare,
remoteCPUBaseline, /* cpuBaseline */ .cpuBaseline = remoteCPUBaseline,
remoteDomainGetJobInfo, /* domainGetJobInfo */ .domainGetJobInfo = remoteDomainGetJobInfo,
remoteDomainAbortJob, /* domainAbortJob */ .domainAbortJob = remoteDomainAbortJob,
remoteDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */ .domainMigrateSetMaxDowntime = remoteDomainMigrateSetMaxDowntime,
remoteDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */ .domainMigrateSetMaxSpeed = remoteDomainMigrateSetMaxSpeed,
remoteDomainEventRegisterAny, /* domainEventRegisterAny */ .domainEventRegisterAny = remoteDomainEventRegisterAny,
remoteDomainEventDeregisterAny, /* domainEventDeregisterAny */ .domainEventDeregisterAny = remoteDomainEventDeregisterAny,
remoteDomainManagedSave, /* domainManagedSave */ .domainManagedSave = remoteDomainManagedSave,
remoteDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ .domainHasManagedSaveImage = remoteDomainHasManagedSaveImage,
remoteDomainManagedSaveRemove, /* domainManagedSaveRemove */ .domainManagedSaveRemove = remoteDomainManagedSaveRemove,
remoteDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ .domainSnapshotCreateXML = remoteDomainSnapshotCreateXML,
remoteDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ .domainSnapshotGetXMLDesc = remoteDomainSnapshotGetXMLDesc,
remoteDomainSnapshotNum, /* domainSnapshotNum */ .domainSnapshotNum = remoteDomainSnapshotNum,
remoteDomainSnapshotListNames, /* domainSnapshotListNames */ .domainSnapshotListNames = remoteDomainSnapshotListNames,
remoteDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ .domainSnapshotLookupByName = remoteDomainSnapshotLookupByName,
remoteDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ .domainHasCurrentSnapshot = remoteDomainHasCurrentSnapshot,
remoteDomainSnapshotCurrent, /* domainSnapshotCurrent */ .domainSnapshotCurrent = remoteDomainSnapshotCurrent,
remoteDomainRevertToSnapshot, /* domainRevertToSnapshot */ .domainRevertToSnapshot = remoteDomainRevertToSnapshot,
remoteDomainSnapshotDelete, /* domainSnapshotDelete */ .domainSnapshotDelete = remoteDomainSnapshotDelete,
remoteQemuDomainMonitorCommand, /* qemuDomainMonitorCommand */ .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand,
remoteDomainOpenConsole, /* domainOpenConsole */ .domainOpenConsole = remoteDomainOpenConsole,
remoteDomainInjectNMI, /* domainInjectNMI */ .domainInjectNMI = remoteDomainInjectNMI,
}; };
static virNetworkDriver network_driver = { static virNetworkDriver network_driver = {

View File

@ -5318,160 +5318,106 @@ static int testNWFilterClose(virConnectPtr conn) {
} }
static virDriver testDriver = { static virDriver testDriver = {
VIR_DRV_TEST, .no = VIR_DRV_TEST,
"Test", .name = "Test",
testOpen, /* open */ .open = testOpen,
testClose, /* close */ .close = testClose,
NULL, /* supports_feature */ .version = testGetVersion,
NULL, /* type */ .getHostname = virGetHostname,
testGetVersion, /* version */ .getMaxVcpus = testGetMaxVCPUs,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .nodeGetInfo = testNodeGetInfo,
virGetHostname, /* getHostname */ .getCapabilities = testGetCapabilities,
NULL, /* getSysinfo */ .listDomains = testListDomains,
testGetMaxVCPUs, /* getMaxVcpus */ .numOfDomains = testNumOfDomains,
testNodeGetInfo, /* nodeGetInfo */ .domainCreateXML = testDomainCreateXML,
testGetCapabilities, /* getCapabilities */ .domainLookupByID = testLookupDomainByID,
testListDomains, /* listDomains */ .domainLookupByUUID = testLookupDomainByUUID,
testNumOfDomains, /* numOfDomains */ .domainLookupByName = testLookupDomainByName,
testDomainCreateXML, /* domainCreateXML */ .domainSuspend = testPauseDomain,
testLookupDomainByID, /* domainLookupByID */ .domainResume = testResumeDomain,
testLookupDomainByUUID, /* domainLookupByUUID */ .domainShutdown = testShutdownDomain,
testLookupDomainByName, /* domainLookupByName */ .domainReboot = testRebootDomain,
testPauseDomain, /* domainSuspend */ .domainDestroy = testDestroyDomain,
testResumeDomain, /* domainResume */ .domainGetOSType = testGetOSType,
testShutdownDomain, /* domainShutdown */ .domainGetMaxMemory = testGetMaxMemory,
testRebootDomain, /* domainReboot */ .domainSetMaxMemory = testSetMaxMemory,
testDestroyDomain, /* domainDestroy */ .domainSetMemory = testSetMemory,
testGetOSType, /* domainGetOSType */ .domainGetInfo = testGetDomainInfo,
testGetMaxMemory, /* domainGetMaxMemory */ .domainGetState = testDomainGetState,
testSetMaxMemory, /* domainSetMaxMemory */ .domainSave = testDomainSave,
testSetMemory, /* domainSetMemory */ .domainRestore = testDomainRestore,
NULL, /* domainSetMemoryFlags */ .domainCoreDump = testDomainCoreDump,
NULL, /* domainSetMemoryParameters */ .domainSetVcpus = testSetVcpus,
NULL, /* domainGetMemoryParameters */ .domainSetVcpusFlags = testDomainSetVcpusFlags,
NULL, /* domainSetBlkioParameters */ .domainGetVcpusFlags = testDomainGetVcpusFlags,
NULL, /* domainGetBlkioParameters */ .domainPinVcpu = testDomainPinVcpu,
testGetDomainInfo, /* domainGetInfo */ .domainGetVcpus = testDomainGetVcpus,
testDomainGetState, /* domainGetState */ .domainGetMaxVcpus = testDomainGetMaxVcpus,
testDomainSave, /* domainSave */ .domainGetXMLDesc = testDomainGetXMLDesc,
testDomainRestore, /* domainRestore */ .listDefinedDomains = testListDefinedDomains,
testDomainCoreDump, /* domainCoreDump */ .numOfDefinedDomains = testNumOfDefinedDomains,
NULL, /* domainScreenshot */ .domainCreate = testDomainCreate,
testSetVcpus, /* domainSetVcpus */ .domainCreateWithFlags = testDomainCreateWithFlags,
testDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainDefineXML = testDomainDefineXML,
testDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainUndefine = testDomainUndefine,
testDomainPinVcpu, /* domainPinVcpu */ .domainGetAutostart = testDomainGetAutostart,
testDomainGetVcpus, /* domainGetVcpus */ .domainSetAutostart = testDomainSetAutostart,
testDomainGetMaxVcpus, /* domainGetMaxVcpus */ .domainGetSchedulerType = testDomainGetSchedulerType,
NULL, /* domainGetSecurityLabel */ .domainGetSchedulerParameters = testDomainGetSchedulerParams,
NULL, /* nodeGetSecurityModel */ .domainSetSchedulerParameters = testDomainSetSchedulerParams,
testDomainGetXMLDesc, /* domainGetXMLDesc */ .domainBlockStats = testDomainBlockStats,
NULL, /* domainXMLFromNative */ .domainInterfaceStats = testDomainInterfaceStats,
NULL, /* domainXMLToNative */ .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory,
testListDefinedDomains, /* listDefinedDomains */ .domainEventRegister = testDomainEventRegister,
testNumOfDefinedDomains, /* numOfDefinedDomains */ .domainEventDeregister = testDomainEventDeregister,
testDomainCreate, /* domainCreate */ .isEncrypted = testIsEncrypted,
testDomainCreateWithFlags, /* domainCreateWithFlags */ .isSecure = testIsSecure,
testDomainDefineXML, /* domainDefineXML */ .domainIsActive = testDomainIsActive,
testDomainUndefine, /* domainUndefine */ .domainIsPersistent = testDomainIsPersistent,
NULL, /* domainAttachDevice */ .domainIsUpdated = testDomainIsUpdated,
NULL, /* domainAttachDeviceFlags */ .domainEventRegisterAny = testDomainEventRegisterAny,
NULL, /* domainDetachDevice */ .domainEventDeregisterAny = testDomainEventDeregisterAny,
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 */
}; };
static virNetworkDriver testNetworkDriver = { static virNetworkDriver testNetworkDriver = {
"Test", "Test",
testOpenNetwork, /* open */ .open = testOpenNetwork,
testCloseNetwork, /* close */ .close = testCloseNetwork,
testNumNetworks, /* numOfNetworks */ .numOfNetworks = testNumNetworks,
testListNetworks, /* listNetworks */ .listNetworks = testListNetworks,
testNumDefinedNetworks, /* numOfDefinedNetworks */ .numOfDefinedNetworks = testNumDefinedNetworks,
testListDefinedNetworks, /* listDefinedNetworks */ .listDefinedNetworks = testListDefinedNetworks,
testLookupNetworkByUUID, /* networkLookupByUUID */ .networkLookupByUUID = testLookupNetworkByUUID,
testLookupNetworkByName, /* networkLookupByName */ .networkLookupByName = testLookupNetworkByName,
testNetworkCreate, /* networkCreateXML */ .networkCreateXML = testNetworkCreate,
testNetworkDefine, /* networkDefineXML */ .networkDefineXML = testNetworkDefine,
testNetworkUndefine, /* networkUndefine */ .networkUndefine = testNetworkUndefine,
testNetworkStart, /* networkCreate */ .networkCreate = testNetworkStart,
testNetworkDestroy, /* networkDestroy */ .networkDestroy = testNetworkDestroy,
testNetworkGetXMLDesc, /* networkGetXMLDesc */ .networkGetXMLDesc = testNetworkGetXMLDesc,
testNetworkGetBridgeName, /* networkGetBridgeName */ .networkGetBridgeName = testNetworkGetBridgeName,
testNetworkGetAutostart, /* networkGetAutostart */ .networkGetAutostart = testNetworkGetAutostart,
testNetworkSetAutostart, /* networkSetAutostart */ .networkSetAutostart = testNetworkSetAutostart,
testNetworkIsActive, /* networkIsActive */ .networkIsActive = testNetworkIsActive,
testNetworkIsPersistent, /* networkIsPersistent */ .networkIsPersistent = testNetworkIsPersistent,
}; };
static virInterfaceDriver testInterfaceDriver = { static virInterfaceDriver testInterfaceDriver = {
"Test", /* name */ "Test", /* name */
testOpenInterface, /* open */ .open = testOpenInterface,
testCloseInterface, /* close */ .close = testCloseInterface,
testNumOfInterfaces, /* numOfInterfaces */ .numOfInterfaces = testNumOfInterfaces,
testListInterfaces, /* listInterfaces */ .listInterfaces = testListInterfaces,
testNumOfDefinedInterfaces, /* numOfDefinedInterfaces */ .numOfDefinedInterfaces = testNumOfDefinedInterfaces,
testListDefinedInterfaces, /* listDefinedInterfaces */ .listDefinedInterfaces = testListDefinedInterfaces,
testLookupInterfaceByName, /* interfaceLookupByName */ .interfaceLookupByName = testLookupInterfaceByName,
testLookupInterfaceByMACString, /* interfaceLookupByMACString */ .interfaceLookupByMACString = testLookupInterfaceByMACString,
testInterfaceGetXMLDesc, /* interfaceGetXMLDesc */ .interfaceGetXMLDesc = testInterfaceGetXMLDesc,
testInterfaceDefineXML, /* interfaceDefineXML */ .interfaceDefineXML = testInterfaceDefineXML,
testInterfaceUndefine, /* interfaceUndefine */ .interfaceUndefine = testInterfaceUndefine,
testInterfaceCreate, /* interfaceCreate */ .interfaceCreate = testInterfaceCreate,
testInterfaceDestroy, /* interfaceDestroy */ .interfaceDestroy = testInterfaceDestroy,
testInterfaceIsActive, /* interfaceIsActive */ .interfaceIsActive = testInterfaceIsActive,
}; };

View File

@ -2181,119 +2181,51 @@ cleanup:
static virDriver umlDriver = { static virDriver umlDriver = {
VIR_DRV_UML, .no = VIR_DRV_UML,
"UML", .name = "UML",
umlOpen, /* open */ .open = umlOpen,
umlClose, /* close */ .close = umlClose,
NULL, /* supports_feature */ .type = umlGetType,
umlGetType, /* type */ .version = umlGetVersion,
umlGetVersion, /* version */ .getHostname = virGetHostname,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .nodeGetInfo = nodeGetInfo,
virGetHostname, /* getHostname */ .getCapabilities = umlGetCapabilities,
NULL, /* getSysinfo */ .listDomains = umlListDomains,
NULL, /* getMaxVcpus */ .numOfDomains = umlNumDomains,
nodeGetInfo, /* nodeGetInfo */ .domainCreateXML = umlDomainCreate,
umlGetCapabilities, /* getCapabilities */ .domainLookupByID = umlDomainLookupByID,
umlListDomains, /* listDomains */ .domainLookupByUUID = umlDomainLookupByUUID,
umlNumDomains, /* numOfDomains */ .domainLookupByName = umlDomainLookupByName,
umlDomainCreate, /* domainCreateXML */ .domainShutdown = umlDomainShutdown,
umlDomainLookupByID, /* domainLookupByID */ .domainDestroy = umlDomainDestroy,
umlDomainLookupByUUID, /* domainLookupByUUID */ .domainGetOSType = umlDomainGetOSType,
umlDomainLookupByName, /* domainLookupByName */ .domainGetMaxMemory = umlDomainGetMaxMemory,
NULL, /* domainSuspend */ .domainSetMaxMemory = umlDomainSetMaxMemory,
NULL, /* domainResume */ .domainSetMemory = umlDomainSetMemory,
umlDomainShutdown, /* domainShutdown */ .domainGetInfo = umlDomainGetInfo,
NULL, /* domainReboot */ .domainGetState = umlDomainGetState,
umlDomainDestroy, /* domainDestroy */ .domainGetXMLDesc = umlDomainGetXMLDesc,
umlDomainGetOSType, /* domainGetOSType */ .listDefinedDomains = umlListDefinedDomains,
umlDomainGetMaxMemory, /* domainGetMaxMemory */ .numOfDefinedDomains = umlNumDefinedDomains,
umlDomainSetMaxMemory, /* domainSetMaxMemory */ .domainCreate = umlDomainStart,
umlDomainSetMemory, /* domainSetMemory */ .domainCreateWithFlags = umlDomainStartWithFlags,
NULL, /* domainSetMemoryFlags */ .domainDefineXML = umlDomainDefine,
NULL, /* domainSetMemoryParameters */ .domainUndefine = umlDomainUndefine,
NULL, /* domainGetMemoryParameters */ .domainAttachDevice = umlDomainAttachDevice,
NULL, /* domainSetBlkioParameters */ .domainAttachDeviceFlags = umlDomainAttachDeviceFlags,
NULL, /* domainGetBlkioParameters */ .domainDetachDevice = umlDomainDetachDevice,
umlDomainGetInfo, /* domainGetInfo */ .domainDetachDeviceFlags = umlDomainDetachDeviceFlags,
umlDomainGetState, /* domainGetState */ .domainGetAutostart = umlDomainGetAutostart,
NULL, /* domainSave */ .domainSetAutostart = umlDomainSetAutostart,
NULL, /* domainRestore */ .domainBlockPeek = umlDomainBlockPeek,
NULL, /* domainCoreDump */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory,
NULL, /* domainScreenshot */ .nodeGetFreeMemory = nodeGetFreeMemory,
NULL, /* domainSetVcpus */ .isEncrypted = umlIsEncrypted,
NULL, /* domainSetVcpusFlags */ .isSecure = umlIsSecure,
NULL, /* domainGetVcpusFlags */ .domainIsActive = umlDomainIsActive,
NULL, /* domainPinVcpu */ .domainIsPersistent = umlDomainIsPersistent,
NULL, /* domainGetVcpus */ .domainIsUpdated = umlDomainIsUpdated,
NULL, /* domainGetMaxVcpus */ .domainOpenConsole = umlDomainOpenConsole,
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 */
}; };
static int static int

View File

@ -8720,133 +8720,74 @@ endjob:
*/ */
virDriver NAME(Driver) = { virDriver NAME(Driver) = {
VIR_DRV_VBOX, .no = VIR_DRV_VBOX,
"VBOX", .name = "VBOX",
vboxOpen, /* open */ .open = vboxOpen,
vboxClose, /* close */ .close = vboxClose,
NULL, /* supports_feature */ .version = vboxGetVersion,
NULL, /* type */ .getHostname = virGetHostname,
vboxGetVersion, /* version */ .getMaxVcpus = vboxGetMaxVcpus,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .nodeGetInfo = nodeGetInfo,
virGetHostname, /* getHostname */ .getCapabilities = vboxGetCapabilities,
NULL, /* getSysinfo */ .listDomains = vboxListDomains,
vboxGetMaxVcpus, /* getMaxVcpus */ .numOfDomains = vboxNumOfDomains,
nodeGetInfo, /* nodeGetInfo */ .domainCreateXML = vboxDomainCreateXML,
vboxGetCapabilities, /* getCapabilities */ .domainLookupByID = vboxDomainLookupByID,
vboxListDomains, /* listDomains */ .domainLookupByUUID = vboxDomainLookupByUUID,
vboxNumOfDomains, /* numOfDomains */ .domainLookupByName = vboxDomainLookupByName,
vboxDomainCreateXML, /* domainCreateXML */ .domainSuspend = vboxDomainSuspend,
vboxDomainLookupByID, /* domainLookupByID */ .domainResume = vboxDomainResume,
vboxDomainLookupByUUID, /* domainLookupByUUID */ .domainShutdown = vboxDomainShutdown,
vboxDomainLookupByName, /* domainLookupByName */ .domainReboot = vboxDomainReboot,
vboxDomainSuspend, /* domainSuspend */ .domainDestroy = vboxDomainDestroy,
vboxDomainResume, /* domainResume */ .domainGetOSType = vboxDomainGetOSType,
vboxDomainShutdown, /* domainShutdown */ .domainSetMemory = vboxDomainSetMemory,
vboxDomainReboot, /* domainReboot */ .domainGetInfo = vboxDomainGetInfo,
vboxDomainDestroy, /* domainDestroy */ .domainGetState = vboxDomainGetState,
vboxDomainGetOSType, /* domainGetOSType */ .domainSave = vboxDomainSave,
NULL, /* domainGetMaxMemory */ .domainSetVcpus = vboxDomainSetVcpus,
NULL, /* domainSetMaxMemory */ .domainSetVcpusFlags = vboxDomainSetVcpusFlags,
vboxDomainSetMemory, /* domainSetMemory */ .domainGetVcpusFlags = vboxDomainGetVcpusFlags,
NULL, /* domainSetMemoryFlags */ .domainGetMaxVcpus = vboxDomainGetMaxVcpus,
NULL, /* domainSetMemoryParameters */ .domainGetXMLDesc = vboxDomainGetXMLDesc,
NULL, /* domainGetMemoryParameters */ .listDefinedDomains = vboxListDefinedDomains,
NULL, /* domainSetBlkioParameters */ .numOfDefinedDomains = vboxNumOfDefinedDomains,
NULL, /* domainGetBlkioParameters */ .domainCreate = vboxDomainCreate,
vboxDomainGetInfo, /* domainGetInfo */ .domainCreateWithFlags = vboxDomainCreateWithFlags,
vboxDomainGetState, /* domainGetState */ .domainDefineXML = vboxDomainDefineXML,
vboxDomainSave, /* domainSave */ .domainUndefine = vboxDomainUndefine,
NULL, /* domainRestore */ .domainAttachDevice = vboxDomainAttachDevice,
NULL, /* domainCoreDump */ .domainAttachDeviceFlags = vboxDomainAttachDeviceFlags,
.domainDetachDevice = vboxDomainDetachDevice,
.domainDetachDeviceFlags = vboxDomainDetachDeviceFlags,
.domainUpdateDeviceFlags = vboxDomainUpdateDeviceFlags,
.nodeGetCellsFreeMemory = nodeGetCellsFreeMemory,
.nodeGetFreeMemory = nodeGetFreeMemory,
#if VBOX_API_VERSION == 4000 #if VBOX_API_VERSION == 4000
vboxDomainScreenshot, /* domainScreenshot */ .domainScreenshot = vboxDomainScreenshot,
#else
NULL, /* domainScreenshot */
#endif #endif
vboxDomainSetVcpus, /* domainSetVcpus */ #if VBOX_API_VERSION != 2002 && VBOX_API_VERSION != 4000
vboxDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainEventRegister = vboxDomainEventRegister,
vboxDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainEventDeregister = vboxDomainEventDeregister,
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 */
#endif #endif
NULL, /* domainMigratePrepare2 */ .isEncrypted = vboxIsEncrypted,
NULL, /* domainMigrateFinish2 */ .isSecure = vboxIsSecure,
NULL, /* nodeDeviceDettach */ .domainIsActive = vboxDomainIsActive,
NULL, /* nodeDeviceReAttach */ .domainIsPersistent = vboxDomainIsPersistent,
NULL, /* nodeDeviceReset */ .domainIsUpdated = vboxDomainIsUpdated,
NULL, /* domainMigratePrepareTunnel */ #if VBOX_API_VERSION != 2002 && VBOX_API_VERSION != 4000
vboxIsEncrypted, /* isEncrypted */ .domainEventRegisterAny = vboxDomainEventRegisterAny,
vboxIsSecure, /* isSecure */ .domainEventDeregisterAny = vboxDomainEventDeregisterAny,
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 */
#endif #endif
NULL, /* domainManagedSave */ .domainSnapshotCreateXML = vboxDomainSnapshotCreateXML,
NULL, /* domainHasManagedSaveImage */ .domainSnapshotGetXMLDesc = vboxDomainSnapshotGetXMLDesc,
NULL, /* domainManagedSaveRemove */ .domainSnapshotNum = vboxDomainSnapshotNum,
vboxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ .domainSnapshotListNames = vboxDomainSnapshotListNames,
vboxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ .domainSnapshotLookupByName = vboxDomainSnapshotLookupByName,
vboxDomainSnapshotNum, /* domainSnapshotNum */ .domainHasCurrentSnapshot = vboxDomainHasCurrentSnapshot,
vboxDomainSnapshotListNames, /* domainSnapshotListNames */ .domainSnapshotCurrent = vboxDomainSnapshotCurrent,
vboxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ .domainRevertToSnapshot = vboxDomainRevertToSnapshot,
vboxDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ .domainSnapshotDelete = vboxDomainSnapshotDelete,
vboxDomainSnapshotCurrent, /* domainSnapshotCurrent */
vboxDomainRevertToSnapshot, /* domainRevertToSnapshot */
vboxDomainSnapshotDelete, /* domainSnapshotDelete */
NULL, /* qemuDomainMonitorCommand */
NULL, /* domainOpenConsole */
NULL, /* domainInjectNMI */
}; };
virNetworkDriver NAME(NetworkDriver) = { virNetworkDriver NAME(NetworkDriver) = {
@ -8865,9 +8806,6 @@ virNetworkDriver NAME(NetworkDriver) = {
.networkCreate = vboxNetworkCreate, .networkCreate = vboxNetworkCreate,
.networkDestroy = vboxNetworkDestroy, .networkDestroy = vboxNetworkDestroy,
.networkGetXMLDesc = vboxNetworkGetXMLDesc, .networkGetXMLDesc = vboxNetworkGetXMLDesc,
.networkGetBridgeName = NULL,
.networkGetAutostart = NULL,
.networkSetAutostart = NULL
}; };
virStorageDriver NAME(StorageDriver) = { virStorageDriver NAME(StorageDriver) = {
@ -8876,24 +8814,7 @@ virStorageDriver NAME(StorageDriver) = {
.close = vboxStorageClose, .close = vboxStorageClose,
.numOfPools = vboxStorageNumOfPools, .numOfPools = vboxStorageNumOfPools,
.listPools = vboxStorageListPools, .listPools = vboxStorageListPools,
.numOfDefinedPools = NULL,
.listDefinedPools = NULL,
.findPoolSources = NULL,
.poolLookupByName = vboxStoragePoolLookupByName, .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, .poolNumOfVolumes = vboxStoragePoolNumOfVolumes,
.poolListVolumes = vboxStoragePoolListVolumes, .poolListVolumes = vboxStoragePoolListVolumes,
@ -8901,7 +8822,6 @@ virStorageDriver NAME(StorageDriver) = {
.volLookupByKey = vboxStorageVolLookupByKey, .volLookupByKey = vboxStorageVolLookupByKey,
.volLookupByPath = vboxStorageVolLookupByPath, .volLookupByPath = vboxStorageVolLookupByPath,
.volCreateXML = vboxStorageVolCreateXML, .volCreateXML = vboxStorageVolCreateXML,
.volCreateXMLFrom = NULL,
.volDelete = vboxStorageVolDelete, .volDelete = vboxStorageVolDelete,
.volGetInfo = vboxStorageVolGetInfo, .volGetInfo = vboxStorageVolGetInfo,
.volGetXMLDesc = vboxStorageVolGetXMLDesc, .volGetXMLDesc = vboxStorageVolGetXMLDesc,

View File

@ -930,119 +930,35 @@ vmwareDomainGetState(virDomainPtr dom,
} }
static virDriver vmwareDriver = { static virDriver vmwareDriver = {
VIR_DRV_VMWARE, .no = VIR_DRV_VMWARE,
"VMWARE", .name = "VMWARE",
vmwareOpen, /* open */ .open = vmwareOpen,
vmwareClose, /* close */ .close = vmwareClose,
NULL, /* supports_feature */ .type = vmwareGetType,
vmwareGetType, /* type */ .version = vmwareGetVersion,
vmwareGetVersion, /* version */ .listDomains = vmwareListDomains,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .numOfDomains = vmwareNumDomains,
NULL, /* getHostname */ .domainCreateXML = vmwareDomainCreateXML,
NULL, /* getSysinfo */ .domainLookupByID = vmwareDomainLookupByID,
NULL, /* getMaxVcpus */ .domainLookupByUUID = vmwareDomainLookupByUUID,
NULL, /* nodeGetInfo */ .domainLookupByName = vmwareDomainLookupByName,
NULL, /* getCapabilities */ .domainSuspend = vmwareDomainSuspend,
vmwareListDomains, /* listDomains */ .domainResume = vmwareDomainResume,
vmwareNumDomains, /* numOfDomains */ .domainShutdown = vmwareDomainShutdown,
vmwareDomainCreateXML, /* domainCreateXML */ .domainReboot = vmwareDomainReboot,
vmwareDomainLookupByID, /* domainLookupByID */ .domainDestroy = vmwareDomainShutdown,
vmwareDomainLookupByUUID, /* domainLookupByUUID */ .domainGetOSType = vmwareGetOSType,
vmwareDomainLookupByName, /* domainLookupByName */ .domainGetInfo = vmwareDomainGetInfo,
vmwareDomainSuspend, /* domainSuspend */ .domainGetState = vmwareDomainGetState,
vmwareDomainResume, /* domainResume */ .domainGetXMLDesc = vmwareDomainGetXMLDesc,
vmwareDomainShutdown, /* domainShutdown */ .listDefinedDomains = vmwareListDefinedDomains,
vmwareDomainReboot, /* domainReboot */ .numOfDefinedDomains = vmwareNumDefinedDomains,
vmwareDomainShutdown, /* domainDestroy */ .domainCreate = vmwareDomainCreate,
vmwareGetOSType, /* domainGetOSType */ .domainCreateWithFlags = vmwareDomainCreateWithFlags,
NULL, /* domainGetMaxMemory */ .domainDefineXML = vmwareDomainDefineXML,
NULL, /* domainSetMaxMemory */ .domainUndefine = vmwareDomainUndefine,
NULL, /* domainSetMemory */ .domainIsActive = vmwareDomainIsActive,
NULL, /* domainSetMemoryFlags */ .domainIsPersistent = vmwareDomainIsPersistent,
NULL, /* domainSetMemoryParameters */
NULL, /* domainGetMemoryParameters */
NULL, /* domainSetBlkioParameters */
NULL, /* domainGetBlkioParameters */
vmwareDomainGetInfo, /* domainGetInfo */
vmwareDomainGetState, /* domainGetState */
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 */
}; };
int int

View File

@ -2140,119 +2140,83 @@ cleanup:
/* The interface which we export upwards to libvirt.c. */ /* The interface which we export upwards to libvirt.c. */
static virDriver xenUnifiedDriver = { static virDriver xenUnifiedDriver = {
VIR_DRV_XEN_UNIFIED, .no = VIR_DRV_XEN_UNIFIED,
"Xen", .name = "Xen",
xenUnifiedOpen, /* open */ .open = xenUnifiedOpen,
xenUnifiedClose, /* close */ .close = xenUnifiedClose,
xenUnifiedSupportsFeature, /* supports_feature */ .supports_feature = xenUnifiedSupportsFeature,
xenUnifiedType, /* type */ .type = xenUnifiedType,
xenUnifiedGetVersion, /* version */ .version = xenUnifiedGetVersion,
NULL, /* libvirtVersion (impl. in libvirt.c) */ .getHostname = virGetHostname,
virGetHostname, /* getHostname */ .getMaxVcpus = xenUnifiedGetMaxVcpus,
NULL, /* getSysinfo */ .nodeGetInfo = xenUnifiedNodeGetInfo,
xenUnifiedGetMaxVcpus, /* getMaxVcpus */ .getCapabilities = xenUnifiedGetCapabilities,
xenUnifiedNodeGetInfo, /* nodeGetInfo */ .listDomains = xenUnifiedListDomains,
xenUnifiedGetCapabilities, /* getCapabilities */ .numOfDomains = xenUnifiedNumOfDomains,
xenUnifiedListDomains, /* listDomains */ .domainCreateXML = xenUnifiedDomainCreateXML,
xenUnifiedNumOfDomains, /* numOfDomains */ .domainLookupByID = xenUnifiedDomainLookupByID,
xenUnifiedDomainCreateXML, /* domainCreateXML */ .domainLookupByUUID = xenUnifiedDomainLookupByUUID,
xenUnifiedDomainLookupByID, /* domainLookupByID */ .domainLookupByName = xenUnifiedDomainLookupByName,
xenUnifiedDomainLookupByUUID, /* domainLookupByUUID */ .domainSuspend = xenUnifiedDomainSuspend,
xenUnifiedDomainLookupByName, /* domainLookupByName */ .domainResume = xenUnifiedDomainResume,
xenUnifiedDomainSuspend, /* domainSuspend */ .domainShutdown = xenUnifiedDomainShutdown,
xenUnifiedDomainResume, /* domainResume */ .domainReboot = xenUnifiedDomainReboot,
xenUnifiedDomainShutdown, /* domainShutdown */ .domainDestroy = xenUnifiedDomainDestroy,
xenUnifiedDomainReboot, /* domainReboot */ .domainGetOSType = xenUnifiedDomainGetOSType,
xenUnifiedDomainDestroy, /* domainDestroy */ .domainGetMaxMemory = xenUnifiedDomainGetMaxMemory,
xenUnifiedDomainGetOSType, /* domainGetOSType */ .domainSetMaxMemory = xenUnifiedDomainSetMaxMemory,
xenUnifiedDomainGetMaxMemory, /* domainGetMaxMemory */ .domainSetMemory = xenUnifiedDomainSetMemory,
xenUnifiedDomainSetMaxMemory, /* domainSetMaxMemory */ .domainGetInfo = xenUnifiedDomainGetInfo,
xenUnifiedDomainSetMemory, /* domainSetMemory */ .domainGetState = xenUnifiedDomainGetState,
NULL, /*domainSetMemoryFlags */ .domainSave = xenUnifiedDomainSave,
NULL, /* domainSetMemoryParameters */ .domainRestore = xenUnifiedDomainRestore,
NULL, /* domainGetMemoryParameters */ .domainCoreDump = xenUnifiedDomainCoreDump,
NULL, /* domainSetBlkioParameters */ .domainSetVcpus = xenUnifiedDomainSetVcpus,
NULL, /* domainGetBlkioParameters */ .domainSetVcpusFlags = xenUnifiedDomainSetVcpusFlags,
xenUnifiedDomainGetInfo, /* domainGetInfo */ .domainGetVcpusFlags = xenUnifiedDomainGetVcpusFlags,
xenUnifiedDomainGetState, /* domainGetState */ .domainPinVcpu = xenUnifiedDomainPinVcpu,
xenUnifiedDomainSave, /* domainSave */ .domainGetVcpus = xenUnifiedDomainGetVcpus,
xenUnifiedDomainRestore, /* domainRestore */ .domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus,
xenUnifiedDomainCoreDump, /* domainCoreDump */ .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc,
NULL, /* domainScreenshot */ .domainXMLFromNative = xenUnifiedDomainXMLFromNative,
xenUnifiedDomainSetVcpus, /* domainSetVcpus */ .domainXMLToNative = xenUnifiedDomainXMLToNative,
xenUnifiedDomainSetVcpusFlags, /* domainSetVcpusFlags */ .listDefinedDomains = xenUnifiedListDefinedDomains,
xenUnifiedDomainGetVcpusFlags, /* domainGetVcpusFlags */ .numOfDefinedDomains = xenUnifiedNumOfDefinedDomains,
xenUnifiedDomainPinVcpu, /* domainPinVcpu */ .domainCreate = xenUnifiedDomainCreate,
xenUnifiedDomainGetVcpus, /* domainGetVcpus */ .domainCreateWithFlags = xenUnifiedDomainCreateWithFlags,
xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */ .domainDefineXML = xenUnifiedDomainDefineXML,
NULL, /* domainGetSecurityLabel */ .domainUndefine = xenUnifiedDomainUndefine,
NULL, /* nodeGetSecurityModel */ .domainAttachDevice = xenUnifiedDomainAttachDevice,
xenUnifiedDomainGetXMLDesc, /* domainGetXMLDesc */ .domainAttachDeviceFlags = xenUnifiedDomainAttachDeviceFlags,
xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */ .domainDetachDevice = xenUnifiedDomainDetachDevice,
xenUnifiedDomainXMLToNative, /* domainXMLToNative */ .domainDetachDeviceFlags = xenUnifiedDomainDetachDeviceFlags,
xenUnifiedListDefinedDomains, /* listDefinedDomains */ .domainUpdateDeviceFlags = xenUnifiedDomainUpdateDeviceFlags,
xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */ .domainGetAutostart = xenUnifiedDomainGetAutostart,
xenUnifiedDomainCreate, /* domainCreate */ .domainSetAutostart = xenUnifiedDomainSetAutostart,
xenUnifiedDomainCreateWithFlags, /* domainCreateWithFlags */ .domainGetSchedulerType = xenUnifiedDomainGetSchedulerType,
xenUnifiedDomainDefineXML, /* domainDefineXML */ .domainGetSchedulerParameters = xenUnifiedDomainGetSchedulerParameters,
xenUnifiedDomainUndefine, /* domainUndefine */ .domainSetSchedulerParameters = xenUnifiedDomainSetSchedulerParameters,
xenUnifiedDomainAttachDevice, /* domainAttachDevice */ .domainMigratePrepare = xenUnifiedDomainMigratePrepare,
xenUnifiedDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ .domainMigratePerform = xenUnifiedDomainMigratePerform,
xenUnifiedDomainDetachDevice, /* domainDetachDevice */ .domainMigrateFinish = xenUnifiedDomainMigrateFinish,
xenUnifiedDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ .domainBlockStats = xenUnifiedDomainBlockStats,
xenUnifiedDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ .domainInterfaceStats = xenUnifiedDomainInterfaceStats,
xenUnifiedDomainGetAutostart, /* domainGetAutostart */ .domainBlockPeek = xenUnifiedDomainBlockPeek,
xenUnifiedDomainSetAutostart, /* domainSetAutostart */ .nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory,
xenUnifiedDomainGetSchedulerType, /* domainGetSchedulerType */ .nodeGetFreeMemory = xenUnifiedNodeGetFreeMemory,
xenUnifiedDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ .domainEventRegister = xenUnifiedDomainEventRegister,
xenUnifiedDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ .domainEventDeregister = xenUnifiedDomainEventDeregister,
xenUnifiedDomainMigratePrepare, /* domainMigratePrepare */ .nodeDeviceDettach = xenUnifiedNodeDeviceDettach,
xenUnifiedDomainMigratePerform, /* domainMigratePerform */ .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach,
xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */ .nodeDeviceReset = xenUnifiedNodeDeviceReset,
xenUnifiedDomainBlockStats, /* domainBlockStats */ .isEncrypted = xenUnifiedIsEncrypted,
xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */ .isSecure = xenUnifiedIsSecure,
NULL, /* domainMemoryStats */ .domainIsActive = xenUnifiedDomainIsActive,
xenUnifiedDomainBlockPeek, /* domainBlockPeek */ .domainIsPersistent = xenUnifiedDomainIsPersistent,
NULL, /* domainMemoryPeek */ .domainIsUpdated = xenUnifiedDomainIsUpdated,
NULL, /* domainGetBlockInfo */ .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny,
xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny,
xenUnifiedNodeGetFreeMemory, /* nodeGetFreeMemory */ .domainOpenConsole = xenUnifiedDomainOpenConsole,
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 */
}; };
/** /**

View File

@ -1827,119 +1827,52 @@ xenapiNodeGetCellsFreeMemory (virConnectPtr conn, unsigned long long *freeMems,
/* The interface which we export upwards to libvirt.c. */ /* The interface which we export upwards to libvirt.c. */
static virDriver xenapiDriver = { static virDriver xenapiDriver = {
VIR_DRV_XENAPI, .no = VIR_DRV_XENAPI,
"XenAPI", .name = "XenAPI",
xenapiOpen, /* open */ .open = xenapiOpen,
xenapiClose, /* close */ .close = xenapiClose,
xenapiSupportsFeature, /* supports_feature */ .supports_feature = xenapiSupportsFeature,
xenapiType, /* type */ .type = xenapiType,
xenapiGetVersion, /* version */ .version = xenapiGetVersion,
NULL, /* libvirtVersion */ .getHostname = xenapiGetHostname,
xenapiGetHostname, /* getHostname */ .getMaxVcpus = xenapiGetMaxVcpus,
NULL, /* getSysinfo */ .nodeGetInfo = xenapiNodeGetInfo,
xenapiGetMaxVcpus, /* getMaxVcpus */ .getCapabilities = xenapiGetCapabilities,
xenapiNodeGetInfo, /* nodeGetInfo */ .listDomains = xenapiListDomains,
xenapiGetCapabilities, /* getCapabilities */ .numOfDomains = xenapiNumOfDomains,
xenapiListDomains, /* listDomains */ .domainCreateXML = xenapiDomainCreateXML,
xenapiNumOfDomains, /* numOfDomains */ .domainLookupByID = xenapiDomainLookupByID,
xenapiDomainCreateXML, /* domainCreateXML */ .domainLookupByUUID = xenapiDomainLookupByUUID,
xenapiDomainLookupByID, /* domainLookupByID */ .domainLookupByName = xenapiDomainLookupByName,
xenapiDomainLookupByUUID, /* domainLookupByUUID */ .domainSuspend = xenapiDomainSuspend,
xenapiDomainLookupByName, /* domainLookupByName */ .domainResume = xenapiDomainResume,
xenapiDomainSuspend, /* domainSuspend */ .domainShutdown = xenapiDomainShutdown,
xenapiDomainResume, /* domainResume */ .domainReboot = xenapiDomainReboot,
xenapiDomainShutdown, /* domainShutdown */ .domainDestroy = xenapiDomainDestroy,
xenapiDomainReboot, /* domainReboot */ .domainGetOSType = xenapiDomainGetOSType,
xenapiDomainDestroy, /* domainDestroy */ .domainGetMaxMemory = xenapiDomainGetMaxMemory,
xenapiDomainGetOSType, /* domainGetOSType */ .domainSetMaxMemory = xenapiDomainSetMaxMemory,
xenapiDomainGetMaxMemory, /* domainGetMaxMemory */ .domainGetInfo = xenapiDomainGetInfo,
xenapiDomainSetMaxMemory, /* domainSetMaxMemory */ .domainGetState = xenapiDomainGetState,
NULL, /* domainSetMemory */ .domainSetVcpus = xenapiDomainSetVcpus,
NULL, /* domainSetMemoryFlags */ .domainSetVcpusFlags = xenapiDomainSetVcpusFlags,
NULL, /* domainSetMemoryParameters */ .domainGetVcpusFlags = xenapiDomainGetVcpusFlags,
NULL, /* domainGetMemoryParameters */ .domainPinVcpu = xenapiDomainPinVcpu,
NULL, /* domainSetBlkioParameters */ .domainGetVcpus = xenapiDomainGetVcpus,
NULL, /* domainGetBlkioParameters */ .domainGetMaxVcpus = xenapiDomainGetMaxVcpus,
xenapiDomainGetInfo, /* domainGetInfo */ .domainGetXMLDesc = xenapiDomainGetXMLDesc,
xenapiDomainGetState, /* domainGetState */ .listDefinedDomains = xenapiListDefinedDomains,
NULL, /* domainSave */ .numOfDefinedDomains = xenapiNumOfDefinedDomains,
NULL, /* domainRestore */ .domainCreate = xenapiDomainCreate,
NULL, /* domainCoreDump */ .domainCreateWithFlags = xenapiDomainCreateWithFlags,
NULL, /* domainScreenshot */ .domainDefineXML = xenapiDomainDefineXML,
xenapiDomainSetVcpus, /* domainSetVcpus */ .domainUndefine = xenapiDomainUndefine,
xenapiDomainSetVcpusFlags, /* domainSetVcpusFlags */ .domainGetAutostart = xenapiDomainGetAutostart,
xenapiDomainGetVcpusFlags, /* domainGetVcpusFlags */ .domainSetAutostart = xenapiDomainSetAutostart,
xenapiDomainPinVcpu, /* domainPinVcpu */ .domainGetSchedulerType = xenapiDomainGetSchedulerType,
xenapiDomainGetVcpus, /* domainGetVcpus */ .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory,
xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */ .nodeGetFreeMemory = xenapiNodeGetFreeMemory,
NULL, /* domainGetSecurityLabel */ .domainIsUpdated = xenapiDomainIsUpdated,
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 */
}; };
/** /**