xen: drop unused callbacks

Found by:

for f in $(sed -n 's/.*Drv[^ ]* \([^;]*\);.*/\1/p' src/xen/xen_driver.h)
do
  git grep "\(\.\|->\)$f\b" src/xen
done | cat

and looking through the resulting list to see which callback struct
members are still necessary.

* src/xen/xen_driver.h (xenUnifiedDriver): Drop all callbacks that
are only used directly.
* src/xen/xen_hypervisor.c (xenHypervisorDriver): Shrink list.
* src/xen/xen_inotify.c (xenInotifyDriver): Likewise.
* src/xen/xend_internal.c (xenDaemonDriver): Likewise.
* src/xen/xm_internal.c (xenXMDriver): Likewise.
* src/xen/xs_internal.c (xenStoreDriver): Likewise.
This commit is contained in:
Eric Blake 2011-07-28 14:57:55 -06:00
parent a1e641a550
commit 1b3765fd34
6 changed files with 1 additions and 33 deletions

View File

@ -81,15 +81,9 @@ extern int xenRegister (void);
* structure with direct calls in xen_unified.c. * structure with direct calls in xen_unified.c.
*/ */
struct xenUnifiedDriver { struct xenUnifiedDriver {
virDrvOpen xenOpen; /* Must not be NULL */ virDrvClose xenClose; /* Only mandatory callback; all others may be NULL */
virDrvClose xenClose; /* Must not be NULL */
virDrvGetVersion xenVersion; virDrvGetVersion xenVersion;
virDrvGetHostname xenGetHostname; virDrvGetHostname xenGetHostname;
virDrvNodeGetInfo xenNodeGetInfo;
virDrvGetCapabilities xenGetCapabilities;
virDrvListDomains xenListDomains;
virDrvNumOfDomains xenNumOfDomains;
virDrvDomainCreateXML xenDomainCreateXML;
virDrvDomainSuspend xenDomainSuspend; virDrvDomainSuspend xenDomainSuspend;
virDrvDomainResume xenDomainResume; virDrvDomainResume xenDomainResume;
virDrvDomainShutdown xenDomainShutdown; virDrvDomainShutdown xenDomainShutdown;
@ -100,10 +94,6 @@ struct xenUnifiedDriver {
virDrvDomainSetMaxMemory xenDomainSetMaxMemory; virDrvDomainSetMaxMemory xenDomainSetMaxMemory;
virDrvDomainSetMemory xenDomainSetMemory; virDrvDomainSetMemory xenDomainSetMemory;
virDrvDomainGetInfo xenDomainGetInfo; virDrvDomainGetInfo xenDomainGetInfo;
virDrvDomainSave xenDomainSave;
virDrvDomainRestore xenDomainRestore;
virDrvDomainCoreDump xenDomainCoreDump;
virDrvDomainScreenshot xenDomainScreenshot;
virDrvDomainPinVcpu xenDomainPinVcpu; virDrvDomainPinVcpu xenDomainPinVcpu;
virDrvDomainGetVcpus xenDomainGetVcpus; virDrvDomainGetVcpus xenDomainGetVcpus;
virDrvListDefinedDomains xenListDefinedDomains; virDrvListDefinedDomains xenListDefinedDomains;
@ -113,9 +103,6 @@ struct xenUnifiedDriver {
virDrvDomainUndefine xenDomainUndefine; virDrvDomainUndefine xenDomainUndefine;
virDrvDomainAttachDeviceFlags xenDomainAttachDeviceFlags; virDrvDomainAttachDeviceFlags xenDomainAttachDeviceFlags;
virDrvDomainDetachDeviceFlags xenDomainDetachDeviceFlags; virDrvDomainDetachDeviceFlags xenDomainDetachDeviceFlags;
virDrvDomainUpdateDeviceFlags xenDomainUpdateDeviceFlags;
virDrvDomainGetAutostart xenDomainGetAutostart;
virDrvDomainSetAutostart xenDomainSetAutostart;
virDrvDomainGetSchedulerType xenDomainGetSchedulerType; virDrvDomainGetSchedulerType xenDomainGetSchedulerType;
virDrvDomainGetSchedulerParameters xenDomainGetSchedulerParameters; virDrvDomainGetSchedulerParameters xenDomainGetSchedulerParameters;
virDrvDomainSetSchedulerParameters xenDomainSetSchedulerParameters; virDrvDomainSetSchedulerParameters xenDomainSetSchedulerParameters;

View File

@ -802,12 +802,8 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain); static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain);
struct xenUnifiedDriver xenHypervisorDriver = { struct xenUnifiedDriver xenHypervisorDriver = {
.xenOpen = xenHypervisorOpen,
.xenClose = xenHypervisorClose, .xenClose = xenHypervisorClose,
.xenVersion = xenHypervisorGetVersion, .xenVersion = xenHypervisorGetVersion,
.xenGetCapabilities = xenHypervisorGetCapabilities,
.xenListDomains = xenHypervisorListDomains,
.xenNumOfDomains = xenHypervisorNumOfDomains,
.xenDomainSuspend = xenHypervisorPauseDomain, .xenDomainSuspend = xenHypervisorPauseDomain,
.xenDomainResume = xenHypervisorResumeDomain, .xenDomainResume = xenHypervisorResumeDomain,
.xenDomainDestroyFlags = xenHypervisorDestroyDomainFlags, .xenDomainDestroyFlags = xenHypervisorDestroyDomainFlags,

View File

@ -49,7 +49,6 @@
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
struct xenUnifiedDriver xenInotifyDriver = { struct xenUnifiedDriver xenInotifyDriver = {
.xenOpen = xenInotifyOpen,
.xenClose = xenInotifyClose, .xenClose = xenInotifyClose,
}; };

View File

@ -3934,13 +3934,8 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path,
} }
struct xenUnifiedDriver xenDaemonDriver = { struct xenUnifiedDriver xenDaemonDriver = {
.xenOpen = xenDaemonOpen,
.xenClose = xenDaemonClose, .xenClose = xenDaemonClose,
.xenVersion = xenDaemonGetVersion, .xenVersion = xenDaemonGetVersion,
.xenNodeGetInfo = xenDaemonNodeGetInfo,
.xenListDomains = xenDaemonListDomains,
.xenNumOfDomains = xenDaemonNumOfDomains,
.xenDomainCreateXML = xenDaemonCreateXML,
.xenDomainSuspend = xenDaemonDomainSuspend, .xenDomainSuspend = xenDaemonDomainSuspend,
.xenDomainResume = xenDaemonDomainResume, .xenDomainResume = xenDaemonDomainResume,
.xenDomainShutdown = xenDaemonDomainShutdown, .xenDomainShutdown = xenDaemonDomainShutdown,
@ -3951,9 +3946,6 @@ struct xenUnifiedDriver xenDaemonDriver = {
.xenDomainSetMaxMemory = xenDaemonDomainSetMaxMemory, .xenDomainSetMaxMemory = xenDaemonDomainSetMaxMemory,
.xenDomainSetMemory = xenDaemonDomainSetMemory, .xenDomainSetMemory = xenDaemonDomainSetMemory,
.xenDomainGetInfo = xenDaemonDomainGetInfo, .xenDomainGetInfo = xenDaemonDomainGetInfo,
.xenDomainSave = xenDaemonDomainSave,
.xenDomainRestore = xenDaemonDomainRestore,
.xenDomainCoreDump = xenDaemonDomainCoreDump,
.xenDomainPinVcpu = xenDaemonDomainPinVcpu, .xenDomainPinVcpu = xenDaemonDomainPinVcpu,
.xenDomainGetVcpus = xenDaemonDomainGetVcpus, .xenDomainGetVcpus = xenDaemonDomainGetVcpus,
.xenListDefinedDomains = xenDaemonListDefinedDomains, .xenListDefinedDomains = xenDaemonListDefinedDomains,
@ -3963,9 +3955,6 @@ struct xenUnifiedDriver xenDaemonDriver = {
.xenDomainUndefine = xenDaemonDomainUndefine, .xenDomainUndefine = xenDaemonDomainUndefine,
.xenDomainAttachDeviceFlags = xenDaemonAttachDeviceFlags, .xenDomainAttachDeviceFlags = xenDaemonAttachDeviceFlags,
.xenDomainDetachDeviceFlags = xenDaemonDetachDeviceFlags, .xenDomainDetachDeviceFlags = xenDaemonDetachDeviceFlags,
.xenDomainUpdateDeviceFlags = xenDaemonUpdateDeviceFlags,
.xenDomainGetAutostart = xenDaemonDomainGetAutostart,
.xenDomainSetAutostart = xenDaemonDomainSetAutostart,
.xenDomainGetSchedulerType = xenDaemonGetSchedulerType, .xenDomainGetSchedulerType = xenDaemonGetSchedulerType,
.xenDomainGetSchedulerParameters = xenDaemonGetSchedulerParameters, .xenDomainGetSchedulerParameters = xenDaemonGetSchedulerParameters,
.xenDomainSetSchedulerParameters = xenDaemonSetSchedulerParameters, .xenDomainSetSchedulerParameters = xenDaemonSetSchedulerParameters,

View File

@ -81,7 +81,6 @@ static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
#define XM_XML_ERROR "Invalid xml" #define XM_XML_ERROR "Invalid xml"
struct xenUnifiedDriver xenXMDriver = { struct xenUnifiedDriver xenXMDriver = {
.xenOpen = xenXMOpen,
.xenClose = xenXMClose, .xenClose = xenXMClose,
.xenDomainGetMaxMemory = xenXMDomainGetMaxMemory, .xenDomainGetMaxMemory = xenXMDomainGetMaxMemory,
.xenDomainSetMaxMemory = xenXMDomainSetMaxMemory, .xenDomainSetMaxMemory = xenXMDomainSetMaxMemory,

View File

@ -42,9 +42,7 @@ static void xenStoreWatchEvent(int watch, int fd, int events, void *data);
static void xenStoreWatchListFree(xenStoreWatchListPtr list); static void xenStoreWatchListFree(xenStoreWatchListPtr list);
struct xenUnifiedDriver xenStoreDriver = { struct xenUnifiedDriver xenStoreDriver = {
.xenOpen = xenStoreOpen,
.xenClose = xenStoreClose, .xenClose = xenStoreClose,
.xenListDomains = xenStoreListDomains,
.xenDomainShutdown = xenStoreDomainShutdown, .xenDomainShutdown = xenStoreDomainShutdown,
.xenDomainReboot = xenStoreDomainReboot, .xenDomainReboot = xenStoreDomainReboot,
.xenDomainGetOSType = xenStoreDomainGetOSType, .xenDomainGetOSType = xenStoreDomainGetOSType,