Signed-off-by: Martin Kletzander mklet...@redhat.com
---
src/test/test_driver.c | 135 -
1 file changed, 90 insertions(+), 45 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 5716449..d88d3fc 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -319,7 +319,8 @@ testBuildXMLConfig(void)
static virCapsPtr
-testBuildCapabilities(virConnectPtr conn) {
+testBuildCapabilities(virConnectPtr conn)
+{
testConnPtr privconn = conn-privateData;
virCapsPtr caps;
virCapsGuestPtr guest;
@@ -504,7 +505,8 @@ testDomObjFromDomain(virDomainPtr domain)
}
static char *
-testDomainGenerateIfname(virDomainDefPtr domdef) {
+testDomainGenerateIfname(virDomainDefPtr domdef)
+{
int maxif = 1024;
int ifctr;
size_t i;
@@ -851,7 +853,8 @@ error:
static char *testBuildFilename(const char *relativeTo,
- const char *filename) {
+ const char *filename)
+{
char *offset;
int baseLen;
char *ret;
@@ -2495,7 +2498,8 @@ static char *testDomainGetOSType(virDomainPtr dom
ATTRIBUTE_UNUSED) {
return ret;
}
-static unsigned long long testDomainGetMaxMemory(virDomainPtr domain) {
+static unsigned long long testDomainGetMaxMemory(virDomainPtr domain)
+{
testConnPtr privconn = domain-conn-privateData;
virDomainObjPtr privdom;
unsigned long long ret = 0;
@@ -2898,7 +2902,8 @@ cleanup:
return ret;
}
-static int testConnectNumOfDefinedDomains(virConnectPtr conn) {
+static int testConnectNumOfDefinedDomains(virConnectPtr conn)
+{
testConnPtr privconn = conn-privateData;
int count;
@@ -2911,7 +2916,8 @@ static int testConnectNumOfDefinedDomains(virConnectPtr
conn) {
static int testConnectListDefinedDomains(virConnectPtr conn,
char **const names,
- int maxnames) {
+ int maxnames)
+{
testConnPtr privconn = conn-privateData;
int n;
@@ -2926,7 +2932,8 @@ static int testConnectListDefinedDomains(virConnectPtr
conn,
}
static virDomainPtr testDomainDefineXML(virConnectPtr conn,
-const char *xml) {
+const char *xml)
+{
testConnPtr privconn = conn-privateData;
virDomainPtr ret = NULL;
virDomainDefPtr def;
@@ -3040,7 +3047,8 @@ cleanup:
static int testNodeGetCellsFreeMemory(virConnectPtr conn,
unsigned long long *freemems,
- int startCell, int maxCells) {
+ int startCell, int maxCells)
+{
testConnPtr privconn = conn-privateData;
int cell;
size_t i;
@@ -3066,7 +3074,8 @@ cleanup:
}
-static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) {
+static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags)
+{
testConnPtr privconn = domain-conn-privateData;
virDomainObjPtr privdom;
virObjectEventPtr event = NULL;
@@ -3108,7 +3117,8 @@ cleanup:
return ret;
}
-static int testDomainCreate(virDomainPtr domain) {
+static int testDomainCreate(virDomainPtr domain)
+{
return testDomainCreateWithFlags(domain, 0);
}
@@ -3475,7 +3485,8 @@ static virDrvOpenStatus testNetworkOpen(virConnectPtr
conn,
return VIR_DRV_OPEN_SUCCESS;
}
-static int testNetworkClose(virConnectPtr conn) {
+static int testNetworkClose(virConnectPtr conn)
+{
conn-networkPrivateData = NULL;
return 0;
}
@@ -3530,7 +3541,8 @@ cleanup:
}
-static int testConnectNumOfNetworks(virConnectPtr conn) {
+static int testConnectNumOfNetworks(virConnectPtr conn)
+{
testConnPtr privconn = conn-privateData;
int numActive = 0;
size_t i;
@@ -3574,7 +3586,8 @@ error:
return -1;
}
-static int testConnectNumOfDefinedNetworks(virConnectPtr conn) {
+static int testConnectNumOfDefinedNetworks(virConnectPtr conn)
+{
testConnPtr privconn = conn-privateData;
int numInactive = 0;
size_t i;
@@ -3678,7 +3691,8 @@ cleanup:
}
-static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml)
{
+static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml)
+{
testConnPtr privconn = conn-privateData;
virNetworkDefPtr def;
virNetworkObjPtr net = NULL;
@@ -3744,7 +3758,8 @@ cleanup:
return ret;
}
-static int testNetworkUndefine(virNetworkPtr network) {
+static int testNetworkUndefine(virNetworkPtr network)
+{
testConnPtr privconn = network-conn-privateData;
virNetworkObjPtr privnet;
int ret = -1;
@@ -3831,7 +3846,8 @@ cleanup:
return ret;
}
-static int testNetworkCreate(virNetworkPtr network) {
+static int testNetworkCreate(virNetworkPtr network)
+{
testConnPtr privconn = network-conn-privateData;
virNetworkObjPtr privnet;
int