[libvirt] [PATCH 0/3] interface: Create common virInterface* APIs
Effectively move code from test_driver.c into virinterfaceobj to count the number of devices and to return a list of names. Patch 3 is a bit out of order from my norm, but at least I didn't forget... FWIW: This is part of the common driver objects code I've been working through. I figured I will post each driver separately rather than one larger series. John Ferlan (3): interface: Introduce virInterfaceObjNumOfInterfaces interface: Introduce virInterfaceObjGetNames interface: Clean up Interface section of test_driver src/conf/virinterfaceobj.c | 54 ++++++++++++++++ src/conf/virinterfaceobj.h | 10 +++ src/libvirt_private.syms | 2 + src/test/test_driver.c | 155 +++++++++++++++++++++------------------------ 4 files changed, 139 insertions(+), 82 deletions(-) -- 2.9.3
Unlike other drivers, this is a test driver only API. Still combining the logic of testConnectNumOfInterfaces and testConnectNumOfDefinedInterfaces makes things a bit easier in the long run. Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/conf/virinterfaceobj.c | 20 ++++++++++++++++++++ src/conf/virinterfaceobj.h | 4 ++++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 24 ++++++------------------ 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 3af972b..0407c1f 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -215,3 +215,23 @@ virInterfaceObjRemove(virInterfaceObjListPtr interfaces, virInterfaceObjUnlock(interfaces->objs[i]); } } + + +int +virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, + bool wantActive) +{ + size_t i; + int ninterfaces = 0; + + for (i = 0; (i < interfaces->count); i++) { + virInterfaceObjPtr obj = interfaces->objs[i]; + virInterfaceObjLock(obj); + if ((wantActive && virInterfaceObjIsActive(obj)) || + (!wantActive && !virInterfaceObjIsActive(obj))) + ninterfaces++; + virInterfaceObjUnlock(obj); + } + + return ninterfaces; +} diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 6c5e2e7..2f07174 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -81,4 +81,8 @@ typedef bool (*virInterfaceObjListFilter)(virConnectPtr conn, virInterfaceDefPtr def); +int +virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, + bool wantActive); + #endif /* __VIRINTERFACEOBJ_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 92083e5..96aacaa 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -938,6 +938,7 @@ virInterfaceObjFindByName; virInterfaceObjListClone; virInterfaceObjListFree; virInterfaceObjLock; +virInterfaceObjNumOfInterfaces; virInterfaceObjRemove; virInterfaceObjUnlock; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index cce4d2d..6910681 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3649,18 +3649,12 @@ testInterfaceObjFindByName(testDriverPtr privconn, static int testConnectNumOfInterfaces(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - size_t i; - int count = 0; + int ninterfaces; testDriverLock(privconn); - for (i = 0; (i < privconn->ifaces.count); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) - count++; - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } + ninterfaces = virInterfaceObjNumOfInterfaces(&privconn->ifaces, true); testDriverUnlock(privconn); - return count; + return ninterfaces; } static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) @@ -3695,18 +3689,12 @@ static int testConnectListInterfaces(virConnectPtr conn, char **const names, int static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - size_t i; - int count = 0; + int ninterfaces; testDriverLock(privconn); - for (i = 0; i < privconn->ifaces.count; i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) - count++; - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } + ninterfaces = virInterfaceObjNumOfInterfaces(&privconn->ifaces, false); testDriverUnlock(privconn); - return count; + return ninterfaces; } static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) -- 2.9.3
On 04/06/2017 04:08 PM, John Ferlan wrote:
Unlike other drivers, this is a test driver only API. Still combining the logic of testConnectNumOfInterfaces and testConnectNumOfDefinedInterfaces makes things a bit easier in the long run.
Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/conf/virinterfaceobj.c | 20 ++++++++++++++++++++ src/conf/virinterfaceobj.h | 4 ++++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 24 ++++++------------------ 4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 3af972b..0407c1f 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -215,3 +215,23 @@ virInterfaceObjRemove(virInterfaceObjListPtr interfaces, virInterfaceObjUnlock(interfaces->objs[i]); } } + + +int +virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, + bool wantActive) +{ + size_t i; + int ninterfaces = 0; + + for (i = 0; (i < interfaces->count); i++) { + virInterfaceObjPtr obj = interfaces->objs[i]; + virInterfaceObjLock(obj); + if ((wantActive && virInterfaceObjIsActive(obj)) || + (!wantActive && !virInterfaceObjIsActive(obj)))
Or simply: if (wantActive == virInterfaceObjIsActive(obj));
+ ninterfaces++; + virInterfaceObjUnlock(obj); + }
ACK Michal
Unlike other drivers, this is a test driver only API. Still combining the logic of testConnectListInterfaces and testConnectListDefinedInterfaces makes things a bit easier in the long run. Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/conf/virinterfaceobj.c | 34 +++++++++++++++++++++++++++++ src/conf/virinterfaceobj.h | 6 ++++++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 54 +++++++++++----------------------------------- 4 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 0407c1f..229226a 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -235,3 +235,37 @@ virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, return ninterfaces; } + + +int +virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, + bool wantActive, + char **const names, + int maxnames) +{ + int nnames = 0; + size_t i; + + for (i = 0; i < interfaces->count && nnames < maxnames; i++) { + virInterfaceObjPtr obj = interfaces->objs[i]; + virInterfaceObjLock(obj); + if ((wantActive && virInterfaceObjIsActive(obj)) || + (!wantActive && !virInterfaceObjIsActive(obj))) { + if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { + virInterfaceObjUnlock(obj); + goto failure; + } + nnames++; + } + virInterfaceObjUnlock(obj); + } + + return nnames; + + failure: + while (--nnames >= 0) + VIR_FREE(names[nnames]); + memset(names, 0, maxnames * sizeof(*names)); + + return -1; +} diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 2f07174..5b0527d 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -85,4 +85,10 @@ int virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, bool wantActive); +int +virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, + bool wantActive, + char **const names, + int maxnames); + #endif /* __VIRINTERFACEOBJ_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 96aacaa..88e530c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -935,6 +935,7 @@ virDomainObjListRename; virInterfaceObjAssignDef; virInterfaceObjFindByMACString; virInterfaceObjFindByName; +virInterfaceObjGetNames; virInterfaceObjListClone; virInterfaceObjListFree; virInterfaceObjLock; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6910681..4e10eb2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3657,33 +3657,18 @@ static int testConnectNumOfInterfaces(virConnectPtr conn) return ninterfaces; } -static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) +static int testConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) { testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; + int nnames; + + memset(names, 0, maxnames * sizeof(*names)); testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto error; - } - } - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } + nnames = virInterfaceObjGetNames(&privconn->ifaces, true, names, maxnames); testDriverUnlock(privconn); - return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; + return nnames; } static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) @@ -3697,33 +3682,18 @@ static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) return ninterfaces; } -static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) +static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int maxnames) { testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; + int nnames; + + memset(names, 0, maxnames * sizeof(*names)); testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto error; - } - } - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } + nnames = virInterfaceObjGetNames(&privconn->ifaces, false, names, maxnames); testDriverUnlock(privconn); - return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; + return nnames; } static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, -- 2.9.3
On 04/06/2017 04:08 PM, John Ferlan wrote:
Unlike other drivers, this is a test driver only API. Still combining the logic of testConnectListInterfaces and testConnectListDefinedInterfaces makes things a bit easier in the long run.
Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/conf/virinterfaceobj.c | 34 +++++++++++++++++++++++++++++ src/conf/virinterfaceobj.h | 6 ++++++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 54 +++++++++++----------------------------------- 4 files changed, 53 insertions(+), 42 deletions(-)
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 0407c1f..229226a 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -235,3 +235,37 @@ virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces,
return ninterfaces; } + + +int +virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, + bool wantActive, + char **const names, + int maxnames) +{ + int nnames = 0; + size_t i; + + for (i = 0; i < interfaces->count && nnames < maxnames; i++) { + virInterfaceObjPtr obj = interfaces->objs[i]; + virInterfaceObjLock(obj); + if ((wantActive && virInterfaceObjIsActive(obj)) || + (!wantActive && !virInterfaceObjIsActive(obj))) {
Again. if (wantActive == virInterfaceObjIsActive()) ...
+ if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { + virInterfaceObjUnlock(obj); + goto failure; + } + nnames++; + } + virInterfaceObjUnlock(obj); + } + + return nnames; + + failure: + while (--nnames >= 0) + VIR_FREE(names[nnames]); + memset(names, 0, maxnames * sizeof(*names));
This isn't necessary. Firstly, VIR_FREE() already sets all those items in the array we've touched to zero. Secondly, the callers already clear our the array (even those items we haven't touched). But mostly, in general, if an error is returned, callers should not rely on anything else that is returned. For instance, should virStrToLong_*(s, &ret, base, &result) return -1, the @result is undefined.
+ + return -1; +} diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 2f07174..5b0527d 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -85,4 +85,10 @@ int virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, bool wantActive);
+int +virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, + bool wantActive, + char **const names, + int maxnames); + #endif /* __VIRINTERFACEOBJ_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 96aacaa..88e530c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -935,6 +935,7 @@ virDomainObjListRename; virInterfaceObjAssignDef; virInterfaceObjFindByMACString; virInterfaceObjFindByName; +virInterfaceObjGetNames; virInterfaceObjListClone; virInterfaceObjListFree; virInterfaceObjLock; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6910681..4e10eb2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3657,33 +3657,18 @@ static int testConnectNumOfInterfaces(virConnectPtr conn) return ninterfaces; }
-static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) +static int testConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) { testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; + int nnames; + + memset(names, 0, maxnames * sizeof(*names));
I don't think this is necessary either, but I don't care that much.
testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto error; - } - } - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } + nnames = virInterfaceObjGetNames(&privconn->ifaces, true, names, maxnames); testDriverUnlock(privconn);
- return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; + return nnames;
ACK Michal
On 04/10/2017 04:11 AM, Michal Privoznik wrote:
On 04/06/2017 04:08 PM, John Ferlan wrote:
Unlike other drivers, this is a test driver only API. Still combining the logic of testConnectListInterfaces and testConnectListDefinedInterfaces makes things a bit easier in the long run.
Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/conf/virinterfaceobj.c | 34 +++++++++++++++++++++++++++++ src/conf/virinterfaceobj.h | 6 ++++++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 54 +++++++++++----------------------------------- 4 files changed, 53 insertions(+), 42 deletions(-)
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 0407c1f..229226a 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -235,3 +235,37 @@ virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces,
return ninterfaces; } + + +int +virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, + bool wantActive, + char **const names, + int maxnames) +{ + int nnames = 0; + size_t i; + + for (i = 0; i < interfaces->count && nnames < maxnames; i++) { + virInterfaceObjPtr obj = interfaces->objs[i]; + virInterfaceObjLock(obj); + if ((wantActive && virInterfaceObjIsActive(obj)) || + (!wantActive && !virInterfaceObjIsActive(obj))) {
Again. if (wantActive == virInterfaceObjIsActive()) ...
+ if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { + virInterfaceObjUnlock(obj); + goto failure; + } + nnames++; + } + virInterfaceObjUnlock(obj); + } + + return nnames; + + failure: + while (--nnames >= 0) + VIR_FREE(names[nnames]); + memset(names, 0, maxnames * sizeof(*names));
This isn't necessary. Firstly, VIR_FREE() already sets all those items in the array we've touched to zero. Secondly, the callers already clear our the array (even those items we haven't touched). But mostly, in general, if an error is returned, callers should not rely on anything else that is returned. For instance, should virStrToLong_*(s, &ret, base, &result) return -1, the @result is undefined.
OK - that's fine... While going through this exercise of convergence I have found some places that did this (nwfilter, storage pool/volume) and others that don't. The "goal" was to be consistent for all. I will remove it -
+ + return -1; +} diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 2f07174..5b0527d 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -85,4 +85,10 @@ int virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, bool wantActive);
+int +virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, + bool wantActive, + char **const names, + int maxnames); + #endif /* __VIRINTERFACEOBJ_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 96aacaa..88e530c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -935,6 +935,7 @@ virDomainObjListRename; virInterfaceObjAssignDef; virInterfaceObjFindByMACString; virInterfaceObjFindByName; +virInterfaceObjGetNames; virInterfaceObjListClone; virInterfaceObjListFree; virInterfaceObjLock; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6910681..4e10eb2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3657,33 +3657,18 @@ static int testConnectNumOfInterfaces(virConnectPtr conn) return ninterfaces; }
-static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) +static int testConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) { testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; + int nnames; + + memset(names, 0, maxnames * sizeof(*names));
I don't think this is necessary either, but I don't care that much.
True, but similar to above it's more of a try to be consistent. In the long run - all the driver specific functions would use a single common function withe the details of driver data (e.g. ->def and 'filter' checks) being handled by specific code. Similarly I will remove it. tks - John
testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto error; - } - } - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } + nnames = virInterfaceObjGetNames(&privconn->ifaces, true, names, maxnames); testDriverUnlock(privconn);
- return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; + return nnames;
ACK
Michal
Clean up the code to adhere to more of the standard two spaces between functions, separate lines for type and function name, one argument per line. Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/test/test_driver.c | 81 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4e10eb2..89c7389 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3646,7 +3646,8 @@ testInterfaceObjFindByName(testDriverPtr privconn, } -static int testConnectNumOfInterfaces(virConnectPtr conn) +static int +testConnectNumOfInterfaces(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; int ninterfaces; @@ -3657,7 +3658,11 @@ static int testConnectNumOfInterfaces(virConnectPtr conn) return ninterfaces; } -static int testConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) + +static int +testConnectListInterfaces(virConnectPtr conn, + char **const names, + int maxnames) { testDriverPtr privconn = conn->privateData; int nnames; @@ -3671,7 +3676,9 @@ static int testConnectListInterfaces(virConnectPtr conn, char **const names, int return nnames; } -static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) + +static int +testConnectNumOfDefinedInterfaces(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; int ninterfaces; @@ -3682,7 +3689,11 @@ static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) return ninterfaces; } -static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int maxnames) + +static int +testConnectListDefinedInterfaces(virConnectPtr conn, + char **const names, + int maxnames) { testDriverPtr privconn = conn->privateData; int nnames; @@ -3696,8 +3707,10 @@ static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const nam return nnames; } -static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, - const char *name) + +static virInterfacePtr +testInterfaceLookupByName(virConnectPtr conn, + const char *name) { testDriverPtr privconn = conn->privateData; virInterfaceObjPtr iface; @@ -3714,8 +3727,10 @@ static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, return ret; } -static virInterfacePtr testInterfaceLookupByMACString(virConnectPtr conn, - const char *mac) + +static virInterfacePtr +testInterfaceLookupByMACString(virConnectPtr conn, + const char *mac) { testDriverPtr privconn = conn->privateData; virInterfaceObjPtr iface; @@ -3744,7 +3759,9 @@ static virInterfacePtr testInterfaceLookupByMACString(virConnectPtr conn, return ret; } -static int testInterfaceIsActive(virInterfacePtr iface) + +static int +testInterfaceIsActive(virInterfacePtr iface) { testDriverPtr privconn = iface->conn->privateData; virInterfaceObjPtr obj; @@ -3761,8 +3778,10 @@ static int testInterfaceIsActive(virInterfacePtr iface) return ret; } -static int testInterfaceChangeBegin(virConnectPtr conn, - unsigned int flags) + +static int +testInterfaceChangeBegin(virConnectPtr conn, + unsigned int flags) { testDriverPtr privconn = conn->privateData; int ret = -1; @@ -3788,8 +3807,10 @@ static int testInterfaceChangeBegin(virConnectPtr conn, return ret; } -static int testInterfaceChangeCommit(virConnectPtr conn, - unsigned int flags) + +static int +testInterfaceChangeCommit(virConnectPtr conn, + unsigned int flags) { testDriverPtr privconn = conn->privateData; int ret = -1; @@ -3816,8 +3837,10 @@ static int testInterfaceChangeCommit(virConnectPtr conn, return ret; } -static int testInterfaceChangeRollback(virConnectPtr conn, - unsigned int flags) + +static int +testInterfaceChangeRollback(virConnectPtr conn, + unsigned int flags) { testDriverPtr privconn = conn->privateData; int ret = -1; @@ -3848,8 +3871,10 @@ static int testInterfaceChangeRollback(virConnectPtr conn, return ret; } -static char *testInterfaceGetXMLDesc(virInterfacePtr iface, - unsigned int flags) + +static char * +testInterfaceGetXMLDesc(virInterfacePtr iface, + unsigned int flags) { testDriverPtr privconn = iface->conn->privateData; virInterfaceObjPtr privinterface; @@ -3869,8 +3894,10 @@ static char *testInterfaceGetXMLDesc(virInterfacePtr iface, } -static virInterfacePtr testInterfaceDefineXML(virConnectPtr conn, const char *xmlStr, - unsigned int flags) +static virInterfacePtr +testInterfaceDefineXML(virConnectPtr conn, + const char *xmlStr, + unsigned int flags) { testDriverPtr privconn = conn->privateData; virInterfaceDefPtr def; @@ -3897,7 +3924,9 @@ static virInterfacePtr testInterfaceDefineXML(virConnectPtr conn, const char *xm return ret; } -static int testInterfaceUndefine(virInterfacePtr iface) + +static int +testInterfaceUndefine(virInterfacePtr iface) { testDriverPtr privconn = iface->conn->privateData; virInterfaceObjPtr privinterface; @@ -3914,8 +3943,10 @@ static int testInterfaceUndefine(virInterfacePtr iface) return ret; } -static int testInterfaceCreate(virInterfacePtr iface, - unsigned int flags) + +static int +testInterfaceCreate(virInterfacePtr iface, + unsigned int flags) { testDriverPtr privconn = iface->conn->privateData; virInterfaceObjPtr privinterface; @@ -3941,8 +3972,10 @@ static int testInterfaceCreate(virInterfacePtr iface, return ret; } -static int testInterfaceDestroy(virInterfacePtr iface, - unsigned int flags) + +static int +testInterfaceDestroy(virInterfacePtr iface, + unsigned int flags) { testDriverPtr privconn = iface->conn->privateData; virInterfaceObjPtr privinterface; -- 2.9.3
On 04/06/2017 04:08 PM, John Ferlan wrote:
Clean up the code to adhere to more of the standard two spaces between functions, separate lines for type and function name, one argument per line.
Signed-off-by: John Ferlan <jferlan@redhat.com> --- src/test/test_driver.c | 81 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 24 deletions(-)
ACK Michal
participants (2)
-
John Ferlan -
Michal Privoznik