4:39 p.m.
Noticed because of the recent xen break in commit 1edf5cc5
(fixed in 934fdcb3), which broke because it touched too many
files, rather than focusing on just xen_driver.c.
Renaming all xen callback structs makes it easier to grep
for use of the callback structs, which in turn makes it easier
to see what still remains in the goal of getting rid of the
callback struct. And using C99 initialization syntax makes
it less likely that future patches will needlessly try to
patch too many files.
Eric Blake (4):
xen: cleanup callback struct
xen: reduce callback special cases
xen: make direct call when there is only one subdriver
xen: drop unused callbacks
src/xen/xen_driver.c | 186 ++++++++++++++++++----------------------------
src/xen/xen_driver.h | 63 ++++++----------
src/xen/xen_hypervisor.c | 52 ++++----------
src/xen/xen_inotify.c | 39 +----------
src/xen/xend_internal.c | 68 +++++++----------
src/xen/xend_internal.h | 6 ++
src/xen/xm_internal.c | 51 +++----------
src/xen/xs_internal.c | 45 ++----------
8 files changed, 167 insertions(+), 343 deletions(-)
--
1.7.4.4
4:39 p.m.
New subject: [libvirt] [PATCH 1/4] xen: cleanup callback struct
Using C99 initializers and xen-specific prefixes will make it
so that future patches are less likely to add callback members
to the xenUnifiedDriver struct, since the goal is to get rid
of the callback struct in the first place.
* src/xen/xen_driver.h (xenUnifiedDriver): Rename all struct
members, to make it obvious which ones are still in use.
* src/xen/xen_driver.c: Update all callers.
* src/xen/xen_hypervisor.c (xenHypervisorDriver): Rewrite with C99
initializers.
* src/xen/xend_internal.c (xenDaemonDriver): Likewise.
* src/xen/xs_internal.c (xenStoreDriver): Likewise.
* src/xen/xm_internal.c (xenXMDriver): Likewise.
* src/xen/xen_inotify.c (xenInotifyDriver): Likewise.
---
src/xen/xen_driver.c | 152 +++++++++++++++++++++++-----------------------
src/xen/xen_driver.h | 76 ++++++++++++------------
src/xen/xen_hypervisor.c | 56 ++++++------------
src/xen/xen_inotify.c | 40 +------------
src/xen/xend_internal.c | 73 +++++++++++------------
src/xen/xm_internal.c | 52 ++++------------
src/xen/xs_internal.c | 47 +++------------
7 files changed, 192 insertions(+), 304 deletions(-)
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index e256c33..afa5d59 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -351,7 +351,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
/* Hypervisor is only run with privilege & required to succeed */
if (xenHavePrivilege()) {
VIR_DEBUG("Trying hypervisor sub-driver");
- if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->open(conn, auth, flags) ==
+ if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenOpen(conn, auth, flags) ==
VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated hypervisor sub-driver");
priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] = 1;
@@ -360,7 +360,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
/* XenD is required to succeed if privileged */
VIR_DEBUG("Trying XenD sub-driver");
- if (drivers[XEN_UNIFIED_XEND_OFFSET]->open(conn, auth, flags) ==
+ if (drivers[XEN_UNIFIED_XEND_OFFSET]->xenOpen(conn, auth, flags) ==
VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated XenD sub-driver");
priv->opened[XEN_UNIFIED_XEND_OFFSET] = 1;
@@ -369,14 +369,14 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
* succeed if root, optional otherwise */
if (priv->xendConfigVersion <= 2) {
VIR_DEBUG("Trying XM sub-driver");
- if (drivers[XEN_UNIFIED_XM_OFFSET]->open(conn, auth, flags) ==
+ if (drivers[XEN_UNIFIED_XM_OFFSET]->xenOpen(conn, auth, flags) ==
VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated XM sub-driver");
priv->opened[XEN_UNIFIED_XM_OFFSET] = 1;
}
}
VIR_DEBUG("Trying XS sub-driver");
- if (drivers[XEN_UNIFIED_XS_OFFSET]->open(conn, auth, flags) ==
+ if (drivers[XEN_UNIFIED_XS_OFFSET]->xenOpen(conn, auth, flags) ==
VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated XS sub-driver");
priv->opened[XEN_UNIFIED_XS_OFFSET] = 1;
@@ -404,7 +404,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
#if WITH_XEN_INOTIFY
if (xenHavePrivilege()) {
VIR_DEBUG("Trying Xen inotify sub-driver");
- if (drivers[XEN_UNIFIED_INOTIFY_OFFSET]->open(conn, auth, flags) ==
+ if (drivers[XEN_UNIFIED_INOTIFY_OFFSET]->xenOpen(conn, auth, flags) ==
VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated Xen inotify sub-driver");
priv->opened[XEN_UNIFIED_INOTIFY_OFFSET] = 1;
@@ -419,7 +419,7 @@ fail:
clean:
VIR_DEBUG("Failed to activate a mandatory sub-driver");
for (i = 0 ; i < XEN_UNIFIED_NR_DRIVERS ; i++)
- if (priv->opened[i]) drivers[i]->close(conn);
+ if (priv->opened[i]) drivers[i]->xenClose(conn);
virMutexDestroy(&priv->lock);
VIR_FREE(priv);
conn->privateData = NULL;
@@ -439,8 +439,8 @@ xenUnifiedClose (virConnectPtr conn)
virDomainEventCallbackListFree(priv->domainEventCallbacks);
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->close)
- (void) drivers[i]->close (conn);
+ if (priv->opened[i] && drivers[i]->xenClose)
+ (void) drivers[i]->xenClose (conn);
virMutexDestroy(&priv->lock);
VIR_FREE(conn->privateData);
@@ -493,8 +493,8 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->version &&
- drivers[i]->version (conn, hvVer) == 0)
+ drivers[i]->xenVersion &&
+ drivers[i]->xenVersion (conn, hvVer) == 0)
return 0;
return -1;
@@ -546,8 +546,8 @@ xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->nodeGetInfo &&
- drivers[i]->nodeGetInfo (conn, info) == 0)
+ drivers[i]->xenNodeGetInfo &&
+ drivers[i]->xenNodeGetInfo (conn, info) == 0)
return 0;
return -1;
@@ -630,8 +630,8 @@ xenUnifiedDomainCreateXML (virConnectPtr conn,
virDomainPtr ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainCreateXML) {
- ret = drivers[i]->domainCreateXML (conn, xmlDesc, flags);
+ if (priv->opened[i] && drivers[i]->xenDomainCreateXML) {
+ ret = drivers[i]->xenDomainCreateXML (conn, xmlDesc, flags);
if (ret) return ret;
}
@@ -835,13 +835,13 @@ xenUnifiedDomainSuspend (virDomainPtr dom)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (i != XEN_UNIFIED_HYPERVISOR_OFFSET &&
priv->opened[i] &&
- drivers[i]->domainSuspend &&
- drivers[i]->domainSuspend (dom) == 0)
+ drivers[i]->xenDomainSuspend &&
+ drivers[i]->xenDomainSuspend (dom) == 0)
return 0;
if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainSuspend &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainSuspend (dom) == 0)
+ drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainSuspend &&
+ drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainSuspend (dom) == 0)
return 0;
return -1;
@@ -859,13 +859,13 @@ xenUnifiedDomainResume (virDomainPtr dom)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (i != XEN_UNIFIED_HYPERVISOR_OFFSET &&
priv->opened[i] &&
- drivers[i]->domainResume &&
- drivers[i]->domainResume (dom) == 0)
+ drivers[i]->xenDomainResume &&
+ drivers[i]->xenDomainResume (dom) == 0)
return 0;
if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainResume &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainResume (dom) == 0)
+ drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainResume &&
+ drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainResume (dom) == 0)
return 0;
return -1;
@@ -879,8 +879,8 @@ xenUnifiedDomainShutdown (virDomainPtr dom)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainShutdown &&
- drivers[i]->domainShutdown (dom) == 0)
+ drivers[i]->xenDomainShutdown &&
+ drivers[i]->xenDomainShutdown (dom) == 0)
return 0;
return -1;
@@ -894,8 +894,8 @@ xenUnifiedDomainReboot (virDomainPtr dom, unsigned int flags)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainReboot &&
- drivers[i]->domainReboot (dom, flags) == 0)
+ drivers[i]->xenDomainReboot &&
+ drivers[i]->xenDomainReboot (dom, flags) == 0)
return 0;
return -1;
@@ -916,13 +916,13 @@ xenUnifiedDomainDestroyFlags(virDomainPtr dom,
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (i != XEN_UNIFIED_HYPERVISOR_OFFSET &&
priv->opened[i] &&
- drivers[i]->domainDestroyFlags &&
- drivers[i]->domainDestroyFlags(dom, flags) == 0)
+ drivers[i]->xenDomainDestroyFlags &&
+ drivers[i]->xenDomainDestroyFlags(dom, flags) == 0)
return 0;
if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroyFlags&&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroyFlags(dom,
+ drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainDestroyFlags&&
+ drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainDestroyFlags(dom,
flags) == 0)
return 0;
@@ -943,8 +943,8 @@ xenUnifiedDomainGetOSType (virDomainPtr dom)
char *ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainGetOSType) {
- ret = drivers[i]->domainGetOSType (dom);
+ if (priv->opened[i] && drivers[i]->xenDomainGetOSType) {
+ ret = drivers[i]->xenDomainGetOSType (dom);
if (ret) return ret;
}
@@ -959,8 +959,8 @@ xenUnifiedDomainGetMaxMemory (virDomainPtr dom)
unsigned long ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainGetMaxMemory) {
- ret = drivers[i]->domainGetMaxMemory (dom);
+ if (priv->opened[i] && drivers[i]->xenDomainGetMaxMemory) {
+ ret = drivers[i]->xenDomainGetMaxMemory (dom);
if (ret != 0) return ret;
}
@@ -982,8 +982,8 @@ xenUnifiedDomainSetMaxMemory (virDomainPtr dom, unsigned long memory)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (i != XEN_UNIFIED_XEND_OFFSET &&
priv->opened[i] &&
- drivers[i]->domainSetMaxMemory &&
- drivers[i]->domainSetMaxMemory (dom, memory) == 0)
+ drivers[i]->xenDomainSetMaxMemory &&
+ drivers[i]->xenDomainSetMaxMemory (dom, memory) == 0)
return 0;
return -1;
@@ -997,8 +997,8 @@ xenUnifiedDomainSetMemory (virDomainPtr dom, unsigned long memory)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainSetMemory &&
- drivers[i]->domainSetMemory (dom, memory) == 0)
+ drivers[i]->xenDomainSetMemory &&
+ drivers[i]->xenDomainSetMemory (dom, memory) == 0)
return 0;
return -1;
@@ -1012,8 +1012,8 @@ xenUnifiedDomainGetInfo (virDomainPtr dom, virDomainInfoPtr info)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainGetInfo &&
- drivers[i]->domainGetInfo (dom, info) == 0)
+ drivers[i]->xenDomainGetInfo &&
+ drivers[i]->xenDomainGetInfo (dom, info) == 0)
return 0;
return -1;
@@ -1068,8 +1068,8 @@ xenUnifiedDomainSave (virDomainPtr dom, const char *to)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainSave &&
- drivers[i]->domainSave (dom, to) == 0)
+ drivers[i]->xenDomainSave &&
+ drivers[i]->xenDomainSave (dom, to) == 0)
return 0;
return -1;
@@ -1083,8 +1083,8 @@ xenUnifiedDomainRestore (virConnectPtr conn, const char *from)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainRestore &&
- drivers[i]->domainRestore (conn, from) == 0)
+ drivers[i]->xenDomainRestore &&
+ drivers[i]->xenDomainRestore (conn, from) == 0)
return 0;
return -1;
@@ -1098,8 +1098,8 @@ xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, unsigned
int flags)
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainCoreDump &&
- drivers[i]->domainCoreDump (dom, to, flags) == 0)
+ drivers[i]->xenDomainCoreDump &&
+ drivers[i]->xenDomainCoreDump (dom, to, flags) == 0)
return 0;
return -1;
@@ -1177,8 +1177,8 @@ xenUnifiedDomainPinVcpu (virDomainPtr dom, unsigned int vcpu,
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] &&
- drivers[i]->domainPinVcpu &&
- drivers[i]->domainPinVcpu (dom, vcpu, cpumap, maplen) == 0)
+ drivers[i]->xenDomainPinVcpu &&
+ drivers[i]->xenDomainPinVcpu (dom, vcpu, cpumap, maplen) == 0)
return 0;
return -1;
@@ -1193,8 +1193,8 @@ xenUnifiedDomainGetVcpus (virDomainPtr dom,
int i, ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainGetVcpus) {
- ret = drivers[i]->domainGetVcpus (dom, info, maxinfo, cpumaps, maplen);
+ if (priv->opened[i] && drivers[i]->xenDomainGetVcpus) {
+ ret = drivers[i]->xenDomainGetVcpus (dom, info, maxinfo, cpumaps,
maplen);
if (ret > 0)
return ret;
}
@@ -1474,8 +1474,8 @@ xenUnifiedListDefinedDomains (virConnectPtr conn, char **const
names,
int ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->listDefinedDomains) {
- ret = drivers[i]->listDefinedDomains (conn, names, maxnames);
+ if (priv->opened[i] && drivers[i]->xenListDefinedDomains) {
+ ret = drivers[i]->xenListDefinedDomains (conn, names, maxnames);
if (ret >= 0) return ret;
}
@@ -1490,8 +1490,8 @@ xenUnifiedNumOfDefinedDomains (virConnectPtr conn)
int ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->numOfDefinedDomains) {
- ret = drivers[i]->numOfDefinedDomains (conn);
+ if (priv->opened[i] && drivers[i]->xenNumOfDefinedDomains) {
+ ret = drivers[i]->xenNumOfDefinedDomains (conn);
if (ret >= 0) return ret;
}
@@ -1507,8 +1507,8 @@ xenUnifiedDomainCreateWithFlags (virDomainPtr dom, unsigned int
flags)
virCheckFlags(0, -1);
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainCreate &&
- drivers[i]->domainCreate (dom) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainCreate &&
+ drivers[i]->xenDomainCreate (dom) == 0)
return 0;
return -1;
@@ -1528,8 +1528,8 @@ xenUnifiedDomainDefineXML (virConnectPtr conn, const char *xml)
virDomainPtr ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainDefineXML) {
- ret = drivers[i]->domainDefineXML (conn, xml);
+ if (priv->opened[i] && drivers[i]->xenDomainDefineXML) {
+ ret = drivers[i]->xenDomainDefineXML (conn, xml);
if (ret) return ret;
}
@@ -1544,8 +1544,8 @@ xenUnifiedDomainUndefineFlags (virDomainPtr dom, unsigned int
flags)
virCheckFlags(0, -1);
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainUndefine &&
- drivers[i]->domainUndefine (dom) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainUndefine &&
+ drivers[i]->xenDomainUndefine (dom) == 0)
return 0;
return -1;
@@ -1573,8 +1573,8 @@ xenUnifiedDomainAttachDevice (virDomainPtr dom, const char *xml)
flags |= VIR_DOMAIN_DEVICE_MODIFY_CONFIG;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainAttachDeviceFlags
&&
- drivers[i]->domainAttachDeviceFlags(dom, xml, flags) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainAttachDeviceFlags
&&
+ drivers[i]->xenDomainAttachDeviceFlags(dom, xml, flags) == 0)
return 0;
return -1;
@@ -1588,8 +1588,8 @@ xenUnifiedDomainAttachDeviceFlags (virDomainPtr dom, const char
*xml,
int i;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainAttachDeviceFlags
&&
- drivers[i]->domainAttachDeviceFlags(dom, xml, flags) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainAttachDeviceFlags
&&
+ drivers[i]->xenDomainAttachDeviceFlags(dom, xml, flags) == 0)
return 0;
return -1;
@@ -1612,8 +1612,8 @@ xenUnifiedDomainDetachDevice (virDomainPtr dom, const char *xml)
flags |= VIR_DOMAIN_DEVICE_MODIFY_CONFIG;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainDetachDeviceFlags
&&
- drivers[i]->domainDetachDeviceFlags(dom, xml, flags) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainDetachDeviceFlags
&&
+ drivers[i]->xenDomainDetachDeviceFlags(dom, xml, flags) == 0)
return 0;
return -1;
@@ -1627,8 +1627,8 @@ xenUnifiedDomainDetachDeviceFlags (virDomainPtr dom, const char
*xml,
int i;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainDetachDeviceFlags
&&
- drivers[i]->domainDetachDeviceFlags(dom, xml, flags) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainDetachDeviceFlags
&&
+ drivers[i]->xenDomainDetachDeviceFlags(dom, xml, flags) == 0)
return 0;
return -1;
@@ -1642,8 +1642,8 @@ xenUnifiedDomainUpdateDeviceFlags (virDomainPtr dom, const char
*xml,
int i;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->domainUpdateDeviceFlags
&&
- drivers[i]->domainUpdateDeviceFlags(dom, xml, flags) == 0)
+ if (priv->opened[i] && drivers[i]->xenDomainUpdateDeviceFlags
&&
+ drivers[i]->xenDomainUpdateDeviceFlags(dom, xml, flags) == 0)
return 0;
return -1;
@@ -1691,8 +1691,8 @@ xenUnifiedDomainGetSchedulerType (virDomainPtr dom, int *nparams)
char *schedulertype;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; i++) {
- if (priv->opened[i] && drivers[i]->domainGetSchedulerType) {
- schedulertype = drivers[i]->domainGetSchedulerType (dom, nparams);
+ if (priv->opened[i] && drivers[i]->xenDomainGetSchedulerType) {
+ schedulertype = drivers[i]->xenDomainGetSchedulerType (dom, nparams);
if (schedulertype != NULL)
return(schedulertype);
}
@@ -1712,8 +1712,8 @@ xenUnifiedDomainGetSchedulerParametersFlags(virDomainPtr dom,
virCheckFlags(0, -1);
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) {
- if (priv->opened[i] && drivers[i]->domainGetSchedulerParameters) {
- ret = drivers[i]->domainGetSchedulerParameters(dom, params, nparams);
+ if (priv->opened[i] && drivers[i]->xenDomainGetSchedulerParameters)
{
+ ret = drivers[i]->xenDomainGetSchedulerParameters(dom, params, nparams);
if (ret == 0)
return(0);
}
@@ -1743,8 +1743,8 @@ xenUnifiedDomainSetSchedulerParametersFlags(virDomainPtr dom,
/* do the hypervisor call last to get better error */
for (i = XEN_UNIFIED_NR_DRIVERS - 1; i >= 0; i--) {
- if (priv->opened[i] && drivers[i]->domainSetSchedulerParameters) {
- ret = drivers[i]->domainSetSchedulerParameters(dom, params, nparams);
+ if (priv->opened[i] && drivers[i]->xenDomainSetSchedulerParameters)
{
+ ret = drivers[i]->xenDomainSetSchedulerParameters(dom, params, nparams);
if (ret == 0)
return 0;
}
diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index 039aea3..256d148 100644
--- a/src/xen/xen_driver.h
+++ b/src/xen/xen_driver.h
@@ -81,44 +81,44 @@ extern int xenRegister (void);
* structure with direct calls in xen_unified.c.
*/
struct xenUnifiedDriver {
- virDrvOpen open;
- virDrvClose close;
- virDrvGetVersion version;
- virDrvGetHostname getHostname;
- virDrvNodeGetInfo nodeGetInfo;
- virDrvGetCapabilities getCapabilities;
- virDrvListDomains listDomains;
- virDrvNumOfDomains numOfDomains;
- virDrvDomainCreateXML domainCreateXML;
- virDrvDomainSuspend domainSuspend;
- virDrvDomainResume domainResume;
- virDrvDomainShutdown domainShutdown;
- virDrvDomainReboot domainReboot;
- virDrvDomainDestroyFlags domainDestroyFlags;
- virDrvDomainGetOSType domainGetOSType;
- virDrvDomainGetMaxMemory domainGetMaxMemory;
- virDrvDomainSetMaxMemory domainSetMaxMemory;
- virDrvDomainSetMemory domainSetMemory;
- virDrvDomainGetInfo domainGetInfo;
- virDrvDomainSave domainSave;
- virDrvDomainRestore domainRestore;
- virDrvDomainCoreDump domainCoreDump;
- virDrvDomainScreenshot domainScreenshot;
- virDrvDomainPinVcpu domainPinVcpu;
- virDrvDomainGetVcpus domainGetVcpus;
- virDrvListDefinedDomains listDefinedDomains;
- virDrvNumOfDefinedDomains numOfDefinedDomains;
- virDrvDomainCreate domainCreate;
- virDrvDomainDefineXML domainDefineXML;
- virDrvDomainUndefine domainUndefine;
- virDrvDomainAttachDeviceFlags domainAttachDeviceFlags;
- virDrvDomainDetachDeviceFlags domainDetachDeviceFlags;
- virDrvDomainUpdateDeviceFlags domainUpdateDeviceFlags;
- virDrvDomainGetAutostart domainGetAutostart;
- virDrvDomainSetAutostart domainSetAutostart;
- virDrvDomainGetSchedulerType domainGetSchedulerType;
- virDrvDomainGetSchedulerParameters domainGetSchedulerParameters;
- virDrvDomainSetSchedulerParameters domainSetSchedulerParameters;
+ virDrvOpen xenOpen;
+ virDrvClose xenClose;
+ virDrvGetVersion xenVersion;
+ virDrvGetHostname xenGetHostname;
+ virDrvNodeGetInfo xenNodeGetInfo;
+ virDrvGetCapabilities xenGetCapabilities;
+ virDrvListDomains xenListDomains;
+ virDrvNumOfDomains xenNumOfDomains;
+ virDrvDomainCreateXML xenDomainCreateXML;
+ virDrvDomainSuspend xenDomainSuspend;
+ virDrvDomainResume xenDomainResume;
+ virDrvDomainShutdown xenDomainShutdown;
+ virDrvDomainReboot xenDomainReboot;
+ virDrvDomainDestroyFlags xenDomainDestroyFlags;
+ virDrvDomainGetOSType xenDomainGetOSType;
+ virDrvDomainGetMaxMemory xenDomainGetMaxMemory;
+ virDrvDomainSetMaxMemory xenDomainSetMaxMemory;
+ virDrvDomainSetMemory xenDomainSetMemory;
+ virDrvDomainGetInfo xenDomainGetInfo;
+ virDrvDomainSave xenDomainSave;
+ virDrvDomainRestore xenDomainRestore;
+ virDrvDomainCoreDump xenDomainCoreDump;
+ virDrvDomainScreenshot xenDomainScreenshot;
+ virDrvDomainPinVcpu xenDomainPinVcpu;
+ virDrvDomainGetVcpus xenDomainGetVcpus;
+ virDrvListDefinedDomains xenListDefinedDomains;
+ virDrvNumOfDefinedDomains xenNumOfDefinedDomains;
+ virDrvDomainCreate xenDomainCreate;
+ virDrvDomainDefineXML xenDomainDefineXML;
+ virDrvDomainUndefine xenDomainUndefine;
+ virDrvDomainAttachDeviceFlags xenDomainAttachDeviceFlags;
+ virDrvDomainDetachDeviceFlags xenDomainDetachDeviceFlags;
+ virDrvDomainUpdateDeviceFlags xenDomainUpdateDeviceFlags;
+ virDrvDomainGetAutostart xenDomainGetAutostart;
+ virDrvDomainSetAutostart xenDomainSetAutostart;
+ virDrvDomainGetSchedulerType xenDomainGetSchedulerType;
+ virDrvDomainGetSchedulerParameters xenDomainGetSchedulerParameters;
+ virDrvDomainSetSchedulerParameters xenDomainSetSchedulerParameters;
};
typedef struct xenXMConfCache *xenXMConfCachePtr;
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 0309d8a..1304e28 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -802,44 +802,24 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain);
struct xenUnifiedDriver xenHypervisorDriver = {
- xenHypervisorOpen, /* open */
- xenHypervisorClose, /* close */
- xenHypervisorGetVersion, /* version */
- NULL, /* hostname */
- NULL, /* nodeGetInfo */
- xenHypervisorGetCapabilities, /* getCapabilities */
- xenHypervisorListDomains, /* listDomains */
- xenHypervisorNumOfDomains, /* numOfDomains */
- NULL, /* domainCreateXML */
- xenHypervisorPauseDomain, /* domainSuspend */
- xenHypervisorResumeDomain, /* domainResume */
- NULL, /* domainShutdown */
- NULL, /* domainReboot */
- xenHypervisorDestroyDomainFlags, /* domainDestroyFlags */
- xenHypervisorDomainGetOSType, /* domainGetOSType */
- xenHypervisorGetMaxMemory, /* domainGetMaxMemory */
- xenHypervisorSetMaxMemory, /* domainSetMaxMemory */
- NULL, /* domainSetMemory */
- xenHypervisorGetDomainInfo, /* domainGetInfo */
- NULL, /* domainSave */
- NULL, /* domainRestore */
- NULL, /* domainCoreDump */
- NULL, /* domainScreenshot */
- xenHypervisorPinVcpu, /* domainPinVcpu */
- xenHypervisorGetVcpus, /* domainGetVcpus */
- NULL, /* listDefinedDomains */
- NULL, /* numOfDefinedDomains */
- NULL, /* domainCreate */
- NULL, /* domainDefineXML */
- NULL, /* domainUndefine */
- NULL, /* domainAttachDeviceFlags */
- NULL, /* domainDetachDeviceFlags */
- NULL, /* domainUpdateDeviceFlags */
- NULL, /* domainGetAutostart */
- NULL, /* domainSetAutostart */
- xenHypervisorGetSchedulerType, /* domainGetSchedulerType */
- xenHypervisorGetSchedulerParameters, /* domainGetSchedulerParameters */
- xenHypervisorSetSchedulerParameters, /* domainSetSchedulerParameters */
+ .xenOpen = xenHypervisorOpen,
+ .xenClose = xenHypervisorClose,
+ .xenVersion = xenHypervisorGetVersion,
+ .xenGetCapabilities = xenHypervisorGetCapabilities,
+ .xenListDomains = xenHypervisorListDomains,
+ .xenNumOfDomains = xenHypervisorNumOfDomains,
+ .xenDomainSuspend = xenHypervisorPauseDomain,
+ .xenDomainResume = xenHypervisorResumeDomain,
+ .xenDomainDestroyFlags = xenHypervisorDestroyDomainFlags,
+ .xenDomainGetOSType = xenHypervisorDomainGetOSType,
+ .xenDomainGetMaxMemory = xenHypervisorGetMaxMemory,
+ .xenDomainSetMaxMemory = xenHypervisorSetMaxMemory,
+ .xenDomainGetInfo = xenHypervisorGetDomainInfo,
+ .xenDomainPinVcpu = xenHypervisorPinVcpu,
+ .xenDomainGetVcpus = xenHypervisorGetVcpus,
+ .xenDomainGetSchedulerType = xenHypervisorGetSchedulerType,
+ .xenDomainGetSchedulerParameters = xenHypervisorGetSchedulerParameters,
+ .xenDomainSetSchedulerParameters = xenHypervisorSetSchedulerParameters,
};
#define virXenError(code, ...) \
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 1496330..73384fe 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -49,44 +49,8 @@
__FUNCTION__, __LINE__, __VA_ARGS__)
struct xenUnifiedDriver xenInotifyDriver = {
- xenInotifyOpen, /* open */
- xenInotifyClose, /* close */
- NULL, /* version */
- NULL, /* hostname */
- NULL, /* nodeGetInfo */
- NULL, /* getCapabilities */
- NULL, /* listDomains */
- NULL, /* numOfDomains */
- NULL, /* domainCreateLinux */
- NULL, /* domainSuspend */
- NULL, /* domainResume */
- NULL, /* domainShutdown */
- NULL, /* domainReboot */
- NULL, /* domainDestroyFlags */
- NULL, /* domainGetOSType */
- NULL, /* domainGetMaxMemory */
- NULL, /* domainSetMaxMemory */
- NULL, /* domainSetMemory */
- NULL, /* domainGetInfo */
- NULL, /* domainSave */
- NULL, /* domainRestore */
- NULL, /* domainCoreDump */
- NULL, /* domainScreenshot */
- NULL, /* domainPinVcpu */
- NULL, /* domainGetVcpus */
- NULL, /* listDefinedDomains */
- NULL, /* numOfDefinedDomains */
- NULL, /* domainCreate */
- NULL, /* domainDefineXML */
- NULL, /* domainUndefine */
- NULL, /* domainAttachDeviceFlags */
- NULL, /* domainDetachDeviceFlags */
- NULL, /* domainUpdateDeviceFlags */
- NULL, /* domainGetAutostart */
- NULL, /* domainSetAutostart */
- NULL, /* domainGetSchedulerType */
- NULL, /* domainGetSchedulerParameters */
- NULL, /* domainSetSchedulerParameters */
+ .xenOpen = xenInotifyOpen,
+ .xenClose = xenInotifyClose,
};
static int
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index cec2e01..bd64167 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3934,44 +3934,41 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path,
}
struct xenUnifiedDriver xenDaemonDriver = {
- xenDaemonOpen, /* open */
- xenDaemonClose, /* close */
- xenDaemonGetVersion, /* version */
- NULL, /* hostname */
- xenDaemonNodeGetInfo, /* nodeGetInfo */
- NULL, /* getCapabilities */
- xenDaemonListDomains, /* listDomains */
- xenDaemonNumOfDomains, /* numOfDomains */
- xenDaemonCreateXML, /* domainCreateXML */
- xenDaemonDomainSuspend, /* domainSuspend */
- xenDaemonDomainResume, /* domainResume */
- xenDaemonDomainShutdown, /* domainShutdown */
- xenDaemonDomainReboot, /* domainReboot */
- xenDaemonDomainDestroyFlags, /* domainDestroyFlags */
- xenDaemonDomainGetOSType, /* domainGetOSType */
- xenDaemonDomainGetMaxMemory, /* domainGetMaxMemory */
- xenDaemonDomainSetMaxMemory, /* domainSetMaxMemory */
- xenDaemonDomainSetMemory, /* domainMaxMemory */
- xenDaemonDomainGetInfo, /* domainGetInfo */
- xenDaemonDomainSave, /* domainSave */
- xenDaemonDomainRestore, /* domainRestore */
- xenDaemonDomainCoreDump, /* domainCoreDump */
- NULL, /* domainScreenshot */
- xenDaemonDomainPinVcpu, /* domainPinVcpu */
- xenDaemonDomainGetVcpus, /* domainGetVcpus */
- xenDaemonListDefinedDomains, /* listDefinedDomains */
- xenDaemonNumOfDefinedDomains,/* numOfDefinedDomains */
- xenDaemonDomainCreate, /* domainCreate */
- xenDaemonDomainDefineXML, /* domainDefineXML */
- xenDaemonDomainUndefine, /* domainUndefine */
- xenDaemonAttachDeviceFlags, /* domainAttachDeviceFlags */
- xenDaemonDetachDeviceFlags, /* domainDetachDeviceFlags */
- xenDaemonUpdateDeviceFlags, /* domainUpdateDeviceFlags */
- xenDaemonDomainGetAutostart, /* domainGetAutostart */
- xenDaemonDomainSetAutostart, /* domainSetAutostart */
- xenDaemonGetSchedulerType, /* domainGetSchedulerType */
- xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */
- xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */
+ .xenOpen = xenDaemonOpen,
+ .xenClose = xenDaemonClose,
+ .xenVersion = xenDaemonGetVersion,
+ .xenNodeGetInfo = xenDaemonNodeGetInfo,
+ .xenListDomains = xenDaemonListDomains,
+ .xenNumOfDomains = xenDaemonNumOfDomains,
+ .xenDomainCreateXML = xenDaemonCreateXML,
+ .xenDomainSuspend = xenDaemonDomainSuspend,
+ .xenDomainResume = xenDaemonDomainResume,
+ .xenDomainShutdown = xenDaemonDomainShutdown,
+ .xenDomainReboot = xenDaemonDomainReboot,
+ .xenDomainDestroyFlags = xenDaemonDomainDestroyFlags,
+ .xenDomainGetOSType = xenDaemonDomainGetOSType,
+ .xenDomainGetMaxMemory = xenDaemonDomainGetMaxMemory,
+ .xenDomainSetMaxMemory = xenDaemonDomainSetMaxMemory,
+ .xenDomainSetMemory = xenDaemonDomainSetMemory,
+ .xenDomainGetInfo = xenDaemonDomainGetInfo,
+ .xenDomainSave = xenDaemonDomainSave,
+ .xenDomainRestore = xenDaemonDomainRestore,
+ .xenDomainCoreDump = xenDaemonDomainCoreDump,
+ .xenDomainPinVcpu = xenDaemonDomainPinVcpu,
+ .xenDomainGetVcpus = xenDaemonDomainGetVcpus,
+ .xenListDefinedDomains = xenDaemonListDefinedDomains,
+ .xenNumOfDefinedDomains = xenDaemonNumOfDefinedDomains,
+ .xenDomainCreate = xenDaemonDomainCreate,
+ .xenDomainDefineXML = xenDaemonDomainDefineXML,
+ .xenDomainUndefine = xenDaemonDomainUndefine,
+ .xenDomainAttachDeviceFlags = xenDaemonAttachDeviceFlags,
+ .xenDomainDetachDeviceFlags = xenDaemonDetachDeviceFlags,
+ .xenDomainUpdateDeviceFlags = xenDaemonUpdateDeviceFlags,
+ .xenDomainGetAutostart = xenDaemonDomainGetAutostart,
+ .xenDomainSetAutostart = xenDaemonDomainSetAutostart,
+ .xenDomainGetSchedulerType = xenDaemonGetSchedulerType,
+ .xenDomainGetSchedulerParameters = xenDaemonGetSchedulerParameters,
+ .xenDomainSetSchedulerParameters = xenDaemonSetSchedulerParameters,
};
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 185303b..cfb2754 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -81,44 +81,20 @@ static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const
char *xml,
#define XM_XML_ERROR "Invalid xml"
struct xenUnifiedDriver xenXMDriver = {
- xenXMOpen, /* open */
- xenXMClose, /* close */
- NULL, /* version */
- NULL, /* hostname */
- NULL, /* nodeGetInfo */
- NULL, /* getCapabilities */
- NULL, /* listDomains */
- NULL, /* numOfDomains */
- NULL, /* domainCreateXML */
- NULL, /* domainSuspend */
- NULL, /* domainResume */
- NULL, /* domainShutdown */
- NULL, /* domainReboot */
- NULL, /* domainDestroyFlags */
- NULL, /* domainGetOSType */
- xenXMDomainGetMaxMemory, /* domainGetMaxMemory */
- xenXMDomainSetMaxMemory, /* domainSetMaxMemory */
- xenXMDomainSetMemory, /* domainMaxMemory */
- xenXMDomainGetInfo, /* domainGetInfo */
- NULL, /* domainSave */
- NULL, /* domainRestore */
- NULL, /* domainCoreDump */
- NULL, /* domainScreenshot */
- xenXMDomainPinVcpu, /* domainPinVcpu */
- NULL, /* domainGetVcpus */
- xenXMListDefinedDomains, /* listDefinedDomains */
- xenXMNumOfDefinedDomains, /* numOfDefinedDomains */
- xenXMDomainCreate, /* domainCreate */
- xenXMDomainDefineXML, /* domainDefineXML */
- xenXMDomainUndefine, /* domainUndefine */
- xenXMDomainAttachDeviceFlags, /* domainAttachDeviceFlags */
- xenXMDomainDetachDeviceFlags, /* domainDetachDeviceFlags */
- NULL, /* domainUpdateDeviceFlags */
- NULL, /* domainGetAutostart */
- NULL, /* domainSetAutostart */
- NULL, /* domainGetSchedulerType */
- NULL, /* domainGetSchedulerParameters */
- NULL, /* domainSetSchedulerParameters */
+ .xenOpen = xenXMOpen,
+ .xenClose = xenXMClose,
+ .xenDomainGetMaxMemory = xenXMDomainGetMaxMemory,
+ .xenDomainSetMaxMemory = xenXMDomainSetMaxMemory,
+ .xenDomainSetMemory = xenXMDomainSetMemory,
+ .xenDomainGetInfo = xenXMDomainGetInfo,
+ .xenDomainPinVcpu = xenXMDomainPinVcpu,
+ .xenListDefinedDomains = xenXMListDefinedDomains,
+ .xenNumOfDefinedDomains = xenXMNumOfDefinedDomains,
+ .xenDomainCreate = xenXMDomainCreate,
+ .xenDomainDefineXML = xenXMDomainDefineXML,
+ .xenDomainUndefine = xenXMDomainUndefine,
+ .xenDomainAttachDeviceFlags = xenXMDomainAttachDeviceFlags,
+ .xenDomainDetachDeviceFlags = xenXMDomainDetachDeviceFlags,
};
#define xenXMError(code, ...) \
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index c1b00e5..0856498 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -42,44 +42,15 @@ static void xenStoreWatchEvent(int watch, int fd, int events, void
*data);
static void xenStoreWatchListFree(xenStoreWatchListPtr list);
struct xenUnifiedDriver xenStoreDriver = {
- xenStoreOpen, /* open */
- xenStoreClose, /* close */
- NULL, /* version */
- NULL, /* hostname */
- NULL, /* nodeGetInfo */
- NULL, /* getCapabilities */
- xenStoreListDomains, /* listDomains */
- NULL, /* numOfDomains */
- NULL, /* domainCreateXML */
- NULL, /* domainSuspend */
- NULL, /* domainResume */
- xenStoreDomainShutdown, /* domainShutdown */
- xenStoreDomainReboot, /* domainReboot */
- NULL, /* domainDestroyFlags */
- xenStoreDomainGetOSType, /* domainGetOSType */
- xenStoreDomainGetMaxMemory, /* domainGetMaxMemory */
- NULL, /* domainSetMaxMemory */
- xenStoreDomainSetMemory, /* domainSetMemory */
- xenStoreGetDomainInfo, /* domainGetInfo */
- NULL, /* domainSave */
- NULL, /* domainRestore */
- NULL, /* domainCoreDump */
- NULL, /* domainScreenshot */
- NULL, /* domainPinVcpu */
- NULL, /* domainGetVcpus */
- NULL, /* listDefinedDomains */
- NULL, /* numOfDefinedDomains */
- NULL, /* domainCreate */
- NULL, /* domainDefineXML */
- NULL, /* domainUndefine */
- NULL, /* domainAttachDeviceFlags */
- NULL, /* domainDetachDeviceFlags */
- NULL, /* domainUpdateDeviceFlags */
- NULL, /* domainGetAutostart */
- NULL, /* domainSetAutostart */
- NULL, /* domainGetSchedulerType */
- NULL, /* domainGetSchedulerParameters */
- NULL, /* domainSetSchedulerParameters */
+ .xenOpen = xenStoreOpen,
+ .xenClose = xenStoreClose,
+ .xenListDomains = xenStoreListDomains,
+ .xenDomainShutdown = xenStoreDomainShutdown,
+ .xenDomainReboot = xenStoreDomainReboot,
+ .xenDomainGetOSType = xenStoreDomainGetOSType,
+ .xenDomainGetMaxMemory = xenStoreDomainGetMaxMemory,
+ .xenDomainSetMemory = xenStoreDomainSetMemory,
+ .xenDomainGetInfo = xenStoreGetDomainInfo,
};
#define virXenStoreError(code, ...) \
--
1.7.4.4
2:44 p.m.
New subject: [libvirt] [PATCH 1/4] xen: cleanup callback struct
On 07/21/2011 05:39 PM, Eric Blake wrote:
Using C99 initializers and xen-specific prefixes will make it
so that future patches are less likely to add callback members
to the xenUnifiedDriver struct, since the goal is to get rid
of the callback struct in the first place.
* src/xen/xen_driver.h (xenUnifiedDriver): Rename all struct
members, to make it obvious which ones are still in use.
* src/xen/xen_driver.c: Update all callers.
* src/xen/xen_hypervisor.c (xenHypervisorDriver): Rewrite with C99
initializers.
* src/xen/xend_internal.c (xenDaemonDriver): Likewise.
* src/xen/xs_internal.c (xenStoreDriver): Likewise.
* src/xen/xm_internal.c (xenXMDriver): Likewise.
* src/xen/xen_inotify.c (xenInotifyDriver): Likewise.
Completely Mechanical. I didn't see any discrepencies (looking with ediff).
ACK.
4:39 p.m.
New subject: [libvirt] [PATCH 2/4] xen: reduce callback special cases
The callback struct is great when iterating through several
possibilities, but when calling a known callback, it's just
overhead. We can make the direct call in those cases.
* src/xen/xen_driver.c (xenUnifiedOpen, xenUnifiedDomainSuspend)
(xenUnifiedDomainResume, xenUnifiedDomainDestroyFlags): Make
direct calls instead of going through callback.
---
src/xen/xen_driver.c | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index afa5d59..2bad8c4 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -351,8 +351,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
/* Hypervisor is only run with privilege & required to succeed */
if (xenHavePrivilege()) {
VIR_DEBUG("Trying hypervisor sub-driver");
- if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenOpen(conn, auth, flags) ==
- VIR_DRV_OPEN_SUCCESS) {
+ if (xenHypervisorOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated hypervisor sub-driver");
priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] = 1;
}
@@ -360,8 +359,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
/* XenD is required to succeed if privileged */
VIR_DEBUG("Trying XenD sub-driver");
- if (drivers[XEN_UNIFIED_XEND_OFFSET]->xenOpen(conn, auth, flags) ==
- VIR_DRV_OPEN_SUCCESS) {
+ if (xenDaemonOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated XenD sub-driver");
priv->opened[XEN_UNIFIED_XEND_OFFSET] = 1;
@@ -369,15 +367,13 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
* succeed if root, optional otherwise */
if (priv->xendConfigVersion <= 2) {
VIR_DEBUG("Trying XM sub-driver");
- if (drivers[XEN_UNIFIED_XM_OFFSET]->xenOpen(conn, auth, flags) ==
- VIR_DRV_OPEN_SUCCESS) {
+ if (xenXMOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated XM sub-driver");
priv->opened[XEN_UNIFIED_XM_OFFSET] = 1;
}
}
VIR_DEBUG("Trying XS sub-driver");
- if (drivers[XEN_UNIFIED_XS_OFFSET]->xenOpen(conn, auth, flags) ==
- VIR_DRV_OPEN_SUCCESS) {
+ if (xenStoreOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated XS sub-driver");
priv->opened[XEN_UNIFIED_XS_OFFSET] = 1;
} else {
@@ -404,8 +400,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned
int flags)
#if WITH_XEN_INOTIFY
if (xenHavePrivilege()) {
VIR_DEBUG("Trying Xen inotify sub-driver");
- if (drivers[XEN_UNIFIED_INOTIFY_OFFSET]->xenOpen(conn, auth, flags) ==
- VIR_DRV_OPEN_SUCCESS) {
+ if (xenInotifyOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated Xen inotify sub-driver");
priv->opened[XEN_UNIFIED_INOTIFY_OFFSET] = 1;
}
@@ -840,8 +835,7 @@ xenUnifiedDomainSuspend (virDomainPtr dom)
return 0;
if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainSuspend &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainSuspend (dom) == 0)
+ xenHypervisorPauseDomain(dom) == 0)
return 0;
return -1;
@@ -864,8 +858,7 @@ xenUnifiedDomainResume (virDomainPtr dom)
return 0;
if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainResume &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainResume (dom) == 0)
+ xenHypervisorResumeDomain(dom) == 0)
return 0;
return -1;
@@ -921,9 +914,7 @@ xenUnifiedDomainDestroyFlags(virDomainPtr dom,
return 0;
if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainDestroyFlags&&
- drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->xenDomainDestroyFlags(dom,
- flags) == 0)
+ xenHypervisorDestroyDomainFlags(dom, flags) == 0)
return 0;
return -1;
--
1.7.4.4
2:46 p.m.
New subject: [libvirt] [PATCH 2/4] xen: reduce callback special cases
On 07/21/2011 05:39 PM, Eric Blake wrote:
The callback struct is great when iterating through several
possibilities, but when calling a known callback, it's just
overhead. We can make the direct call in those cases.
* src/xen/xen_driver.c (xenUnifiedOpen, xenUnifiedDomainSuspend)
(xenUnifiedDomainResume, xenUnifiedDomainDestroyFlags): Make
direct calls instead of going through callback.
Again, purely mechanical, and no problems noticed in the conversion.
ACK.
4:39 p.m.
New subject: [libvirt] [PATCH 3/4] xen: make direct call when there is only one subdriver
No need to use a for loop if we know there is exactly one client.
* src/xen/xen_driver.c (xenUnifiedClose): Call close
unconditionally, to match xenUnifiedOpen.
(xenUnifiedNodeGetInfo, xenUnifiedDomainCreateXML)
(xenUnifiedDomainSave, xenUnifiedDomainRestore)
(xenUnifiedDomainCoreDump, xenUnifiedDomainUpdateDeviceFlags):
Make direct call to lone implementation.
* src/xen/xend_internal.h (xenDaemonDomainCoreDump)
(xenDaemonUpdateDeviceFlags, xenDaemonCreateXML): Add prototypes.
* src/xen/xend_internal.c (xenDaemonDomainCoreDump)
(xenDaemonUpdateDeviceFlags, xenDaemonCreateXML): Export.
---
src/xen/xen_driver.c | 61 ++++++++++++----------------------------------
src/xen/xend_internal.c | 6 ++--
src/xen/xend_internal.h | 6 ++++
3 files changed, 25 insertions(+), 48 deletions(-)
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 2bad8c4..b7122f0 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -414,7 +414,8 @@ fail:
clean:
VIR_DEBUG("Failed to activate a mandatory sub-driver");
for (i = 0 ; i < XEN_UNIFIED_NR_DRIVERS ; i++)
- if (priv->opened[i]) drivers[i]->xenClose(conn);
+ if (priv->opened[i])
+ drivers[i]->xenClose(conn);
virMutexDestroy(&priv->lock);
VIR_FREE(priv);
conn->privateData = NULL;
@@ -434,8 +435,8 @@ xenUnifiedClose (virConnectPtr conn)
virDomainEventCallbackListFree(priv->domainEventCallbacks);
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->xenClose)
- (void) drivers[i]->xenClose (conn);
+ if (priv->opened[i])
+ drivers[i]->xenClose(conn);
virMutexDestroy(&priv->lock);
VIR_FREE(conn->privateData);
@@ -537,14 +538,9 @@ static int
xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info)
{
GET_PRIVATE(conn);
- int i;
-
- for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] &&
- drivers[i]->xenNodeGetInfo &&
- drivers[i]->xenNodeGetInfo (conn, info) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonNodeGetInfo(conn, info);
return -1;
}
@@ -621,15 +617,9 @@ xenUnifiedDomainCreateXML (virConnectPtr conn,
const char *xmlDesc, unsigned int flags)
{
GET_PRIVATE(conn);
- int i;
- virDomainPtr ret;
-
- for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->xenDomainCreateXML) {
- ret = drivers[i]->xenDomainCreateXML (conn, xmlDesc, flags);
- if (ret) return ret;
- }
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonCreateXML(conn, xmlDesc, flags);
return NULL;
}
@@ -1055,14 +1045,9 @@ static int
xenUnifiedDomainSave (virDomainPtr dom, const char *to)
{
GET_PRIVATE(dom->conn);
- int i;
-
- for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] &&
- drivers[i]->xenDomainSave &&
- drivers[i]->xenDomainSave (dom, to) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonDomainSave(dom, to);
return -1;
}
@@ -1070,14 +1055,9 @@ static int
xenUnifiedDomainRestore (virConnectPtr conn, const char *from)
{
GET_PRIVATE(conn);
- int i;
-
- for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] &&
- drivers[i]->xenDomainRestore &&
- drivers[i]->xenDomainRestore (conn, from) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonDomainRestore(conn, from);
return -1;
}
@@ -1085,14 +1065,9 @@ static int
xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, unsigned int flags)
{
GET_PRIVATE(dom->conn);
- int i;
-
- for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] &&
- drivers[i]->xenDomainCoreDump &&
- drivers[i]->xenDomainCoreDump (dom, to, flags) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonDomainCoreDump(dom, to, flags);
return -1;
}
@@ -1630,13 +1605,9 @@ xenUnifiedDomainUpdateDeviceFlags (virDomainPtr dom, const char
*xml,
unsigned int flags)
{
GET_PRIVATE(dom->conn);
- int i;
-
- for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i] && drivers[i]->xenDomainUpdateDeviceFlags
&&
- drivers[i]->xenDomainUpdateDeviceFlags(dom, xml, flags) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonUpdateDeviceFlags(dom, xml, flags);
return -1;
}
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index bd64167..f56beb9 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1638,7 +1638,7 @@ xenDaemonDomainSave(virDomainPtr domain, const char *filename)
*
* Returns 0 in case of success, -1 in case of error.
*/
-static int
+int
xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
unsigned int flags)
{
@@ -2608,7 +2608,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char
*uuid)
*
* Returns a new domain object or NULL in case of failure
*/
-static virDomainPtr
+virDomainPtr
xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
unsigned int flags)
{
@@ -2841,7 +2841,7 @@ cleanup:
*
* Returns 0 in case of success, -1 in case of failure.
*/
-static int
+int
xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
unsigned int flags)
{
diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
index a5dd359..eee67b5 100644
--- a/src/xen/xend_internal.h
+++ b/src/xen/xend_internal.h
@@ -107,6 +107,8 @@ int xenDaemonDomainShutdown(virDomainPtr domain);
int xenDaemonDomainReboot(virDomainPtr domain, unsigned int flags);
int xenDaemonDomainDestroyFlags(virDomainPtr domain, unsigned int flags);
int xenDaemonDomainSave(virDomainPtr domain, const char *filename);
+int xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
+ unsigned int flags);
int xenDaemonDomainRestore(virConnectPtr conn, const char *filename);
int xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory);
int xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory);
@@ -140,6 +142,8 @@ int xenDaemonDomainGetVcpus (virDomainPtr domain,
int maxinfo,
unsigned char *cpumaps,
int maplen);
+int xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
+ unsigned int flags);
int xenDaemonDomainGetAutostart (virDomainPtr dom,
int *autostart);
int xenDaemonDomainSetAutostart (virDomainPtr domain,
@@ -149,6 +153,8 @@ int xenDaemonDomainSetAutostart (virDomainPtr domain,
extern struct xenUnifiedDriver xenDaemonDriver;
int xenDaemonInit (void);
+virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
+ unsigned int flags);
virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id);
virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid);
virDomainPtr xenDaemonLookupByName(virConnectPtr conn, const char *domname);
--
1.7.4.4
3 p.m.
New subject: [libvirt] [PATCH 3/4] xen: make direct call when there is only one subdriver
On 07/21/2011 05:39 PM, Eric Blake wrote:
No need to use a for loop if we know there is exactly one client.
* src/xen/xen_driver.c (xenUnifiedClose): Call close
unconditionally, to match xenUnifiedOpen.
(xenUnifiedNodeGetInfo, xenUnifiedDomainCreateXML)
(xenUnifiedDomainSave, xenUnifiedDomainRestore)
(xenUnifiedDomainCoreDump, xenUnifiedDomainUpdateDeviceFlags):
Make direct call to lone implementation.
* src/xen/xend_internal.h (xenDaemonDomainCoreDump)
(xenDaemonUpdateDeviceFlags, xenDaemonCreateXML): Add prototypes.
* src/xen/xend_internal.c (xenDaemonDomainCoreDump)
(xenDaemonUpdateDeviceFlags, xenDaemonCreateXML): Export.
---
src/xen/xen_driver.c | 61 ++++++++++++----------------------------------
src/xen/xend_internal.c | 6 ++--
src/xen/xend_internal.h | 6 ++++
3 files changed, 25 insertions(+), 48 deletions(-)
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 2bad8c4..b7122f0 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -414,7 +414,8 @@ fail:
clean:
VIR_DEBUG("Failed to activate a mandatory sub-driver");
for (i = 0 ; i< XEN_UNIFIED_NR_DRIVERS ; i++)
- if (priv->opened[i]) drivers[i]->xenClose(conn);
+ if (priv->opened[i])
+ drivers[i]->xenClose(conn);
I only see whitespace change here. Was there supposed to be more?
virMutexDestroy(&priv->lock);
VIR_FREE(priv);
conn->privateData = NULL;
@@ -434,8 +435,8 @@ xenUnifiedClose (virConnectPtr conn)
virDomainEventCallbackListFree(priv->domainEventCallbacks);
for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&& drivers[i]->xenClose)
- (void) drivers[i]->xenClose (conn);
+ if (priv->opened[i])
+ drivers[i]->xenClose(conn);
I guess the logic here is that if opened[i] is true, there must have
been a xenOpen(), and if there was a xenOpen() there must be a xenClose()?
virMutexDestroy(&priv->lock);
VIR_FREE(conn->privateData);
@@ -537,14 +538,9 @@ static int
xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info)
{
GET_PRIVATE(conn);
- int i;
-
- for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&&
- drivers[i]->xenNodeGetInfo&&
- drivers[i]->xenNodeGetInfo (conn, info) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonNodeGetInfo(conn, info);
return -1;
For all of these, is it that you've determined by examining all of the
driver info structs that only one driver has a particular callback? Can
we guarantee that will continue to be the case in the future?
Conditional ACK, based on satisfactory answers to these questions...
}
@@ -621,15 +617,9 @@ xenUnifiedDomainCreateXML (virConnectPtr conn,
const char *xmlDesc, unsigned int flags)
{
GET_PRIVATE(conn);
- int i;
- virDomainPtr ret;
-
- for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&& drivers[i]->xenDomainCreateXML) {
- ret = drivers[i]->xenDomainCreateXML (conn, xmlDesc, flags);
- if (ret) return ret;
- }
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonCreateXML(conn, xmlDesc, flags);
return NULL;
}
@@ -1055,14 +1045,9 @@ static int
xenUnifiedDomainSave (virDomainPtr dom, const char *to)
{
GET_PRIVATE(dom->conn);
- int i;
-
- for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&&
- drivers[i]->xenDomainSave&&
- drivers[i]->xenDomainSave (dom, to) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonDomainSave(dom, to);
return -1;
}
@@ -1070,14 +1055,9 @@ static int
xenUnifiedDomainRestore (virConnectPtr conn, const char *from)
{
GET_PRIVATE(conn);
- int i;
-
- for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&&
- drivers[i]->xenDomainRestore&&
- drivers[i]->xenDomainRestore (conn, from) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonDomainRestore(conn, from);
return -1;
}
@@ -1085,14 +1065,9 @@ static int
xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, unsigned int flags)
{
GET_PRIVATE(dom->conn);
- int i;
-
- for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&&
- drivers[i]->xenDomainCoreDump&&
- drivers[i]->xenDomainCoreDump (dom, to, flags) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonDomainCoreDump(dom, to, flags);
return -1;
}
@@ -1630,13 +1605,9 @@ xenUnifiedDomainUpdateDeviceFlags (virDomainPtr dom, const char
*xml,
unsigned int flags)
{
GET_PRIVATE(dom->conn);
- int i;
-
- for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
- if (priv->opened[i]&&
drivers[i]->xenDomainUpdateDeviceFlags&&
- drivers[i]->xenDomainUpdateDeviceFlags(dom, xml, flags) == 0)
- return 0;
+ if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
+ return xenDaemonUpdateDeviceFlags(dom, xml, flags);
return -1;
}
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index bd64167..f56beb9 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1638,7 +1638,7 @@ xenDaemonDomainSave(virDomainPtr domain, const char *filename)
*
* Returns 0 in case of success, -1 in case of error.
*/
-static int
+int
xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
unsigned int flags)
{
@@ -2608,7 +2608,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char
*uuid)
*
* Returns a new domain object or NULL in case of failure
*/
-static virDomainPtr
+virDomainPtr
xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
unsigned int flags)
{
@@ -2841,7 +2841,7 @@ cleanup:
*
* Returns 0 in case of success, -1 in case of failure.
*/
-static int
+int
xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
unsigned int flags)
{
diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
index a5dd359..eee67b5 100644
--- a/src/xen/xend_internal.h
+++ b/src/xen/xend_internal.h
@@ -107,6 +107,8 @@ int xenDaemonDomainShutdown(virDomainPtr domain);
int xenDaemonDomainReboot(virDomainPtr domain, unsigned int flags);
int xenDaemonDomainDestroyFlags(virDomainPtr domain, unsigned int flags);
int xenDaemonDomainSave(virDomainPtr domain, const char *filename);
+int xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
+ unsigned int flags);
int xenDaemonDomainRestore(virConnectPtr conn, const char *filename);
int xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory);
int xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory);
@@ -140,6 +142,8 @@ int xenDaemonDomainGetVcpus (virDomainPtr domain,
int maxinfo,
unsigned char *cpumaps,
int maplen);
+int xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
+ unsigned int flags);
int xenDaemonDomainGetAutostart (virDomainPtr dom,
int *autostart);
int xenDaemonDomainSetAutostart (virDomainPtr domain,
@@ -149,6 +153,8 @@ int xenDaemonDomainSetAutostart (virDomainPtr domain,
extern struct xenUnifiedDriver xenDaemonDriver;
int xenDaemonInit (void);
+virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
+ unsigned int flags);
virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id);
virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid);
virDomainPtr xenDaemonLookupByName(virConnectPtr conn, const char *domname);
3:34 p.m.
New subject: [libvirt] [PATCH 3/4] xen: make direct call when there is only one subdriver
On 07/28/2011 02:00 PM, Laine Stump wrote:
On 07/21/2011 05:39 PM, Eric Blake wrote:
> No need to use a for loop if we know there is exactly one client.
>
> VIR_DEBUG("Failed to activate a mandatory sub-driver");
> for (i = 0 ; i< XEN_UNIFIED_NR_DRIVERS ; i++)
> - if (priv->opened[i]) drivers[i]->xenClose(conn);
> + if (priv->opened[i])
> + drivers[i]->xenClose(conn);
I only see whitespace change here. Was there supposed to be more?
This one was whitespace only (our style being that if() and its embedded
statements should be separated lines).
> virMutexDestroy(&priv->lock);
> VIR_FREE(priv);
> conn->privateData = NULL;
> @@ -434,8 +435,8 @@ xenUnifiedClose (virConnectPtr conn)
> virDomainEventCallbackListFree(priv->domainEventCallbacks);
>
> for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
> - if (priv->opened[i]&& drivers[i]->xenClose)
> - (void) drivers[i]->xenClose (conn);
> + if (priv->opened[i])
> + drivers[i]->xenClose(conn);
I guess the logic here is that if opened[i] is true, there must have
been a xenOpen(), and if there was a xenOpen() there must be a xenClose()?
Correct. I will also squash in a variant of this hunk from patch 4/4 to
make it more obvious that xenOpen and xenClose callbacks must be
non-NULL (xen-inotify was the best example of using only those two
callbacks):
struct xenUnifiedDriver {
- virDrvOpen xenOpen;
- virDrvClose xenClose;
+ virDrvClose xenClose; /* Only mandatory callback; all others may be
NULL */
> virMutexDestroy(&priv->lock);
> VIR_FREE(conn->privateData);
> @@ -537,14 +538,9 @@ static int
> xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info)
> {
> GET_PRIVATE(conn);
> - int i;
> -
> - for (i = 0; i< XEN_UNIFIED_NR_DRIVERS; ++i)
> - if (priv->opened[i]&&
> - drivers[i]->xenNodeGetInfo&&
> - drivers[i]->xenNodeGetInfo (conn, info) == 0)
> - return 0;
>
> + if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
> + return xenDaemonNodeGetInfo(conn, info);
> return -1;
For all of these, is it that you've determined by examining all of the
driver info structs that only one driver has a particular callback? Can
we guarantee that will continue to be the case in the future?
The guarantee that there is only one driver using the callback was made
by the formula in the commit comment in patch 4:
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 used exactly once.
I'll update the commit message accordingly.
The guarantee that this will continue to be the case in the future:
well, after this patch, there are 0 uses of these particular callbacks,
so patch 4 removes the callback member from the struct. If the struct
doesn't have a callback member, then new code can't accidentally add
another callback :)
Conditional ACK, based on satisfactory answers to these questions...
I hope that was satisfactory, because I'm pushing as soon as I also
answer your comments to patch 4 :)
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
3:41 p.m.
New subject: [libvirt] [PATCH 3/4] xen: make direct call when there is only one subdriver
On 07/28/2011 04:34 PM, Eric Blake wrote:
On 07/28/2011 02:00 PM, Laine Stump wrote:
>
> Conditional ACK, based on satisfactory answers to these questions...
I hope that was satisfactory, because I'm pushing as soon as I also
answer your comments to patch 4 :)
Yep. I'm happy.
4:39 p.m.
New subject: [libvirt] [PATCH 4/4] 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.
---
src/xen/xen_driver.h | 15 +--------------
src/xen/xen_hypervisor.c | 4 ----
src/xen/xen_inotify.c | 1 -
src/xen/xend_internal.c | 11 -----------
src/xen/xm_internal.c | 1 -
src/xen/xs_internal.c | 2 --
6 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index 256d148..ca711d4 100644
--- a/src/xen/xen_driver.h
+++ b/src/xen/xen_driver.h
@@ -81,15 +81,9 @@ extern int xenRegister (void);
* structure with direct calls in xen_unified.c.
*/
struct xenUnifiedDriver {
- virDrvOpen xenOpen;
- virDrvClose xenClose;
+ virDrvClose xenClose; /* Only mandatory callback; all others may be NULL */
virDrvGetVersion xenVersion;
virDrvGetHostname xenGetHostname;
- virDrvNodeGetInfo xenNodeGetInfo;
- virDrvGetCapabilities xenGetCapabilities;
- virDrvListDomains xenListDomains;
- virDrvNumOfDomains xenNumOfDomains;
- virDrvDomainCreateXML xenDomainCreateXML;
virDrvDomainSuspend xenDomainSuspend;
virDrvDomainResume xenDomainResume;
virDrvDomainShutdown xenDomainShutdown;
@@ -100,10 +94,6 @@ struct xenUnifiedDriver {
virDrvDomainSetMaxMemory xenDomainSetMaxMemory;
virDrvDomainSetMemory xenDomainSetMemory;
virDrvDomainGetInfo xenDomainGetInfo;
- virDrvDomainSave xenDomainSave;
- virDrvDomainRestore xenDomainRestore;
- virDrvDomainCoreDump xenDomainCoreDump;
- virDrvDomainScreenshot xenDomainScreenshot;
virDrvDomainPinVcpu xenDomainPinVcpu;
virDrvDomainGetVcpus xenDomainGetVcpus;
virDrvListDefinedDomains xenListDefinedDomains;
@@ -113,9 +103,6 @@ struct xenUnifiedDriver {
virDrvDomainUndefine xenDomainUndefine;
virDrvDomainAttachDeviceFlags xenDomainAttachDeviceFlags;
virDrvDomainDetachDeviceFlags xenDomainDetachDeviceFlags;
- virDrvDomainUpdateDeviceFlags xenDomainUpdateDeviceFlags;
- virDrvDomainGetAutostart xenDomainGetAutostart;
- virDrvDomainSetAutostart xenDomainSetAutostart;
virDrvDomainGetSchedulerType xenDomainGetSchedulerType;
virDrvDomainGetSchedulerParameters xenDomainGetSchedulerParameters;
virDrvDomainSetSchedulerParameters xenDomainSetSchedulerParameters;
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 1304e28..cb22b89 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -802,12 +802,8 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain);
struct xenUnifiedDriver xenHypervisorDriver = {
- .xenOpen = xenHypervisorOpen,
.xenClose = xenHypervisorClose,
.xenVersion = xenHypervisorGetVersion,
- .xenGetCapabilities = xenHypervisorGetCapabilities,
- .xenListDomains = xenHypervisorListDomains,
- .xenNumOfDomains = xenHypervisorNumOfDomains,
.xenDomainSuspend = xenHypervisorPauseDomain,
.xenDomainResume = xenHypervisorResumeDomain,
.xenDomainDestroyFlags = xenHypervisorDestroyDomainFlags,
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 73384fe..d0cd907 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -49,7 +49,6 @@
__FUNCTION__, __LINE__, __VA_ARGS__)
struct xenUnifiedDriver xenInotifyDriver = {
- .xenOpen = xenInotifyOpen,
.xenClose = xenInotifyClose,
};
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index f56beb9..6d5a854 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3934,13 +3934,8 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path,
}
struct xenUnifiedDriver xenDaemonDriver = {
- .xenOpen = xenDaemonOpen,
.xenClose = xenDaemonClose,
.xenVersion = xenDaemonGetVersion,
- .xenNodeGetInfo = xenDaemonNodeGetInfo,
- .xenListDomains = xenDaemonListDomains,
- .xenNumOfDomains = xenDaemonNumOfDomains,
- .xenDomainCreateXML = xenDaemonCreateXML,
.xenDomainSuspend = xenDaemonDomainSuspend,
.xenDomainResume = xenDaemonDomainResume,
.xenDomainShutdown = xenDaemonDomainShutdown,
@@ -3951,9 +3946,6 @@ struct xenUnifiedDriver xenDaemonDriver = {
.xenDomainSetMaxMemory = xenDaemonDomainSetMaxMemory,
.xenDomainSetMemory = xenDaemonDomainSetMemory,
.xenDomainGetInfo = xenDaemonDomainGetInfo,
- .xenDomainSave = xenDaemonDomainSave,
- .xenDomainRestore = xenDaemonDomainRestore,
- .xenDomainCoreDump = xenDaemonDomainCoreDump,
.xenDomainPinVcpu = xenDaemonDomainPinVcpu,
.xenDomainGetVcpus = xenDaemonDomainGetVcpus,
.xenListDefinedDomains = xenDaemonListDefinedDomains,
@@ -3963,9 +3955,6 @@ struct xenUnifiedDriver xenDaemonDriver = {
.xenDomainUndefine = xenDaemonDomainUndefine,
.xenDomainAttachDeviceFlags = xenDaemonAttachDeviceFlags,
.xenDomainDetachDeviceFlags = xenDaemonDetachDeviceFlags,
- .xenDomainUpdateDeviceFlags = xenDaemonUpdateDeviceFlags,
- .xenDomainGetAutostart = xenDaemonDomainGetAutostart,
- .xenDomainSetAutostart = xenDaemonDomainSetAutostart,
.xenDomainGetSchedulerType = xenDaemonGetSchedulerType,
.xenDomainGetSchedulerParameters = xenDaemonGetSchedulerParameters,
.xenDomainSetSchedulerParameters = xenDaemonSetSchedulerParameters,
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index cfb2754..95387c9 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -81,7 +81,6 @@ static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char
*xml,
#define XM_XML_ERROR "Invalid xml"
struct xenUnifiedDriver xenXMDriver = {
- .xenOpen = xenXMOpen,
.xenClose = xenXMClose,
.xenDomainGetMaxMemory = xenXMDomainGetMaxMemory,
.xenDomainSetMaxMemory = xenXMDomainSetMaxMemory,
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 0856498..21018fd 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -42,9 +42,7 @@ static void xenStoreWatchEvent(int watch, int fd, int events, void
*data);
static void xenStoreWatchListFree(xenStoreWatchListPtr list);
struct xenUnifiedDriver xenStoreDriver = {
- .xenOpen = xenStoreOpen,
.xenClose = xenStoreClose,
- .xenListDomains = xenStoreListDomains,
.xenDomainShutdown = xenStoreDomainShutdown,
.xenDomainReboot = xenStoreDomainReboot,
.xenDomainGetOSType = xenStoreDomainGetOSType,
--
1.7.4.4
3:03 p.m.
New subject: [libvirt] [PATCH 4/4] xen: drop unused callbacks
On 07/21/2011 05:39 PM, Eric Blake wrote:
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.
Sure. Why not? Simple is good.
ACK.
3:58 p.m.
New subject: [libvirt] [PATCH 4/4] xen: drop unused callbacks
On 07/28/2011 02:03 PM, Laine Stump wrote:
On 07/21/2011 05:39 PM, Eric Blake wrote:
> 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.
/me glad I wrote this in the commit message, as it wasn't trivial to
come up with
Sure. Why not? Simple is good.
ACK.
OK, series pushed, with patch 3 amended as described in my reply.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
4866
days inactive
4873
days old
11 comments
2 participants
participants (2)
-
Eric Blake -
Laine Stump