9:26 a.m.
*** BLURB HERE ***
Michal Prívozník (2):
objecteventtest: Drop lifecycleEventCounter_reset()
objecteventtest: Don't overwrite @ret on failure
tests/objecteventtest.c | 129 +++++++++++-----------------------------
1 file changed, 36 insertions(+), 93 deletions(-)
--
2.32.0
9:26 a.m.
New subject: [PATCH 1/2] objecteventtest: Drop lifecycleEventCounter_reset()
The sole purpose of the lifecycleEventCounter_reset() function is
to zero out given lifecycleEventCounter struct. Well, we can let
the compiler zero it out when declaring a variable and just
remove the function.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/objecteventtest.c | 66 +++++++++--------------------------------
1 file changed, 14 insertions(+), 52 deletions(-)
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index 1e84d4be11..6b1a6acd47 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -82,17 +82,6 @@ typedef struct {
int deletedEvents;
} lifecycleEventCounter;
-static void
-lifecycleEventCounter_reset(lifecycleEventCounter *counter)
-{
- counter->startEvents = 0;
- counter->stopEvents = 0;
- counter->defineEvents = 0;
- counter->undefineEvents = 0;
- counter->unexpectedEvents = 0;
- counter->createdEvents = 0;
- counter->deletedEvents = 0;
-}
typedef struct {
virConnectPtr conn;
@@ -202,13 +191,11 @@ static int
testDomainCreateXMLOld(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virDomainPtr dom = NULL;
int ret = -1;
bool registered = false;
- lifecycleEventCounter_reset(&counter);
-
if (virConnectDomainEventRegister(test->conn,
domainLifecycleCb,
&counter, NULL) != 0)
@@ -242,14 +229,12 @@ static int
testDomainCreateXMLNew(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int eventId = VIR_DOMAIN_EVENT_ID_LIFECYCLE;
virDomainPtr dom = NULL;
int id;
int ret = -1;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectDomainEventRegisterAny(test->conn, NULL, eventId,
VIR_DOMAIN_EVENT_CALLBACK(&domainLifecycleCb),
&counter, NULL);
@@ -283,15 +268,13 @@ static int
testDomainCreateXMLMixed(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virDomainPtr dom;
int ret = -1;
int id1 = -1;
int id2 = -1;
bool registered = false;
- lifecycleEventCounter_reset(&counter);
-
/* Fun with mixing old and new API, also with global and
* per-domain. Handler should be fired three times, once for each
* registration. */
@@ -360,14 +343,12 @@ static int
testDomainDefine(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int eventId = VIR_DOMAIN_EVENT_ID_LIFECYCLE;
virDomainPtr dom = NULL;
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectDomainEventRegisterAny(test->conn, NULL, eventId,
VIR_DOMAIN_EVENT_CALLBACK(&domainLifecycleCb),
&counter, NULL);
@@ -411,7 +392,7 @@ static int
testDomainStartStopEvent(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int eventId = VIR_DOMAIN_EVENT_ID_LIFECYCLE;
int id;
int ret = -1;
@@ -419,8 +400,6 @@ testDomainStartStopEvent(const void *data)
virConnectPtr conn2 = NULL;
virDomainPtr dom2 = NULL;
- lifecycleEventCounter_reset(&counter);
-
dom = virDomainLookupByName(test->conn, "test");
if (dom == NULL)
return -1;
@@ -476,13 +455,11 @@ static int
testNetworkCreateXML(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virNetworkPtr net;
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectNetworkEventRegisterAny(test->conn, NULL,
VIR_NETWORK_EVENT_ID_LIFECYCLE,
VIR_NETWORK_EVENT_CALLBACK(&networkLifecycleCb),
@@ -512,13 +489,11 @@ static int
testNetworkDefine(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virNetworkPtr net;
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectNetworkEventRegisterAny(test->conn, NULL,
VIR_NETWORK_EVENT_ID_LIFECYCLE,
VIR_NETWORK_EVENT_CALLBACK(&networkLifecycleCb),
@@ -563,15 +538,13 @@ static int
testNetworkStartStopEvent(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int id;
int ret = 0;
if (!test->net)
return -1;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectNetworkEventRegisterAny(test->conn, test->net,
VIR_NETWORK_EVENT_ID_LIFECYCLE,
VIR_NETWORK_EVENT_CALLBACK(&networkLifecycleCb),
@@ -599,13 +572,11 @@ static int
testStoragePoolCreateXML(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virStoragePoolPtr pool;
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolLifecycleCb),
@@ -635,13 +606,11 @@ static int
testStoragePoolDefine(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virStoragePoolPtr pool;
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolLifecycleCb),
@@ -686,7 +655,7 @@ static int
testStoragePoolStartStopEvent(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int refreshCounter;
int id1, id2;
int ret = 0;
@@ -694,7 +663,6 @@ testStoragePoolStartStopEvent(const void *data)
if (!test->pool)
return -1;
- lifecycleEventCounter_reset(&counter);
refreshCounter = 0;
id1 = virConnectStoragePoolEventRegisterAny(test->conn, test->pool,
@@ -730,12 +698,10 @@ static int
testStoragePoolBuild(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolLifecycleCb),
@@ -762,12 +728,10 @@ static int
testStoragePoolDelete(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolLifecycleCb),
@@ -793,13 +757,11 @@ static int
testNodeDeviceCreateXML(const void *data)
{
const objecteventTest *test = data;
- lifecycleEventCounter counter;
+ lifecycleEventCounter counter = { 0 };
virNodeDevicePtr dev;
int id;
int ret = 0;
- lifecycleEventCounter_reset(&counter);
-
id = virConnectNodeDeviceEventRegisterAny(test->conn, NULL,
VIR_NODE_DEVICE_EVENT_ID_LIFECYCLE,
VIR_NODE_DEVICE_EVENT_CALLBACK(&nodeDeviceLifecycleCb),
--
2.32.0
9:26 a.m.
New subject: [PATCH 2/2] objecteventtest: Don't overwrite @ret on failure
Our general pattern is to initialize @ret to -1 and set it to 0
only at the end of a function. Some functions in
objecteventtest.c do not follow this pattern.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/objecteventtest.c | 63 ++++++++++++++---------------------------
1 file changed, 22 insertions(+), 41 deletions(-)
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index 6b1a6acd47..5f63f6f5cb 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -347,7 +347,7 @@ testDomainDefine(const void *data)
int eventId = VIR_DOMAIN_EVENT_ID_LIFECYCLE;
virDomainPtr dom = NULL;
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectDomainEventRegisterAny(test->conn, NULL, eventId,
VIR_DOMAIN_EVENT_CALLBACK(&domainLifecycleCb),
@@ -357,12 +357,10 @@ testDomainDefine(const void *data)
dom = virDomainDefineXML(test->conn, domainDef);
if (dom == NULL || virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.defineEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
@@ -370,16 +368,14 @@ testDomainDefine(const void *data)
virDomainUndefine(dom);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.undefineEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
-
+ ret = 0;
cleanup:
virConnectDomainEventDeregisterAny(test->conn, id);
if (dom != NULL)
@@ -458,7 +454,7 @@ testNetworkCreateXML(const void *data)
lifecycleEventCounter counter = { 0 };
virNetworkPtr net;
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectNetworkEventRegisterAny(test->conn, NULL,
VIR_NETWORK_EVENT_ID_LIFECYCLE,
@@ -467,15 +463,14 @@ testNetworkCreateXML(const void *data)
net = virNetworkCreateXML(test->conn, networkDef);
if (!net || virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.startEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectNetworkEventDeregisterAny(test->conn, id);
if (net) {
@@ -492,7 +487,7 @@ testNetworkDefine(const void *data)
lifecycleEventCounter counter = { 0 };
virNetworkPtr net;
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectNetworkEventRegisterAny(test->conn, NULL,
VIR_NETWORK_EVENT_ID_LIFECYCLE,
@@ -503,12 +498,10 @@ testNetworkDefine(const void *data)
net = virNetworkDefineXML(test->conn, networkDef);
if (!net || virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.defineEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
@@ -516,16 +509,15 @@ testNetworkDefine(const void *data)
virNetworkUndefine(net);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.undefineEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectNetworkEventDeregisterAny(test->conn, id);
if (net)
@@ -540,7 +532,7 @@ testNetworkStartStopEvent(const void *data)
const objecteventTest *test = data;
lifecycleEventCounter counter = { 0 };
int id;
- int ret = 0;
+ int ret = -1;
if (!test->net)
return -1;
@@ -553,15 +545,15 @@ testNetworkStartStopEvent(const void *data)
virNetworkDestroy(test->net);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.startEvents != 1 || counter.stopEvents != 1 ||
counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
+
+ ret = 0;
cleanup:
virConnectNetworkEventDeregisterAny(test->conn, id);
@@ -575,7 +567,7 @@ testStoragePoolCreateXML(const void *data)
lifecycleEventCounter counter = { 0 };
virStoragePoolPtr pool;
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
@@ -584,15 +576,14 @@ testStoragePoolCreateXML(const void *data)
pool = virStoragePoolCreateXML(test->conn, storagePoolDef, 0);
if (!pool || virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.startEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectStoragePoolEventDeregisterAny(test->conn, id);
if (pool) {
@@ -609,7 +600,7 @@ testStoragePoolDefine(const void *data)
lifecycleEventCounter counter = { 0 };
virStoragePoolPtr pool;
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
@@ -620,12 +611,10 @@ testStoragePoolDefine(const void *data)
pool = virStoragePoolDefineXML(test->conn, storagePoolDef, 0);
if (!pool || virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.defineEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
@@ -633,16 +622,14 @@ testStoragePoolDefine(const void *data)
virStoragePoolUndefine(pool);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.undefineEvents != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
-
+ ret = 0;
cleanup:
virConnectStoragePoolEventDeregisterAny(test->conn, id);
if (pool)
@@ -656,15 +643,13 @@ testStoragePoolStartStopEvent(const void *data)
{
const objecteventTest *test = data;
lifecycleEventCounter counter = { 0 };
- int refreshCounter;
+ int refreshCounter = 0;
int id1, id2;
- int ret = 0;
+ int ret = -1;
if (!test->pool)
return -1;
- refreshCounter = 0;
-
id1 = virConnectStoragePoolEventRegisterAny(test->conn, test->pool,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolLifecycleCb),
@@ -678,16 +663,15 @@ testStoragePoolStartStopEvent(const void *data)
virStoragePoolDestroy(test->pool);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.startEvents != 1 || counter.stopEvents != 1 ||
refreshCounter != 1 || counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectStoragePoolEventDeregisterAny(test->conn, id1);
virConnectStoragePoolEventDeregisterAny(test->conn, id2);
@@ -700,7 +684,7 @@ testStoragePoolBuild(const void *data)
const objecteventTest *test = data;
lifecycleEventCounter counter = { 0 };
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
@@ -710,15 +694,14 @@ testStoragePoolBuild(const void *data)
virStoragePoolBuild(test->pool, 0);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.createdEvents != 1) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectStoragePoolEventDeregisterAny(test->conn, id);
return ret;
@@ -730,7 +713,7 @@ testStoragePoolDelete(const void *data)
const objecteventTest *test = data;
lifecycleEventCounter counter = { 0 };
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectStoragePoolEventRegisterAny(test->conn, NULL,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
@@ -740,15 +723,14 @@ testStoragePoolDelete(const void *data)
virStoragePoolDelete(test->pool, 0);
if (virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.deletedEvents != 1) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectStoragePoolEventDeregisterAny(test->conn, id);
return ret;
@@ -760,7 +742,7 @@ testNodeDeviceCreateXML(const void *data)
lifecycleEventCounter counter = { 0 };
virNodeDevicePtr dev;
int id;
- int ret = 0;
+ int ret = -1;
id = virConnectNodeDeviceEventRegisterAny(test->conn, NULL,
VIR_NODE_DEVICE_EVENT_ID_LIFECYCLE,
@@ -770,16 +752,15 @@ testNodeDeviceCreateXML(const void *data)
virNodeDeviceDestroy(dev);
if (!dev || virEventRunDefaultImpl() < 0) {
- ret = -1;
goto cleanup;
}
if (counter.createdEvents != 1 || counter.deletedEvents != 1 ||
counter.unexpectedEvents > 0) {
- ret = -1;
goto cleanup;
}
+ ret = 0;
cleanup:
virConnectNodeDeviceEventDeregisterAny(test->conn, id);
if (dev)
--
2.32.0
4:59 a.m.
On Fri, Oct 15, 2021 at 04:26:42PM +0200, Michal Privoznik wrote:
*** BLURB HERE ***
Michal Prívozník (2):
objecteventtest: Drop lifecycleEventCounter_reset()
objecteventtest: Don't overwrite @ret on failure
tests/objecteventtest.c | 129 +++++++++++-----------------------------
1 file changed, 36 insertions(+), 93 deletions(-)
--
2.32.0
Reviewed-by: Erik Skultety <eskultet@redhat>
1123
days inactive
1126
days old
3 comments
2 participants
participants (2)
-
Erik Skultety -
Michal Privoznik