[RFC PATCH v1 2/5] node_device_udev: Test for mdevctlTimeout != -1
It is done a little differently everywhere in libvirt, but most common is to
test for != -1.
Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com>
---
src/node_device/node_device_udev.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index b4bdfbeec841..9f2abb9eb0dd 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -88,7 +88,7 @@ udevEventDataDispose(void *obj)
if (priv->watch != -1)
virEventRemoveHandle(priv->watch);
- if (priv->mdevctlTimeout > 0)
+ if (priv->mdevctlTimeout != -1)
virEventRemoveTimeout(priv->mdevctlTimeout);
if (!priv->udev_monitor)
@@ -139,6 +139,7 @@ udevEventDataNew(void)
return NULL;
}
+ ret->mdevctlTimeout = -1;
ret->watch = -1;
return ret;
}
@@ -2077,7 +2078,7 @@ launchMdevctlUpdateThread(int timer G_GNUC_UNUSED, void *opaque)
udevEventData *priv = opaque;
virThread thread;
- if (priv->mdevctlTimeout > 0) {
+ if (priv->mdevctlTimeout != -1) {
virEventRemoveTimeout(priv->mdevctlTimeout);
priv->mdevctlTimeout = -1;
}
@@ -2187,7 +2188,7 @@ scheduleMdevctlUpdate(udevEventData *data,
bool force)
{
if (!force) {
- if (data->mdevctlTimeout > 0)
+ if (data->mdevctlTimeout != -1)
virEventRemoveTimeout(data->mdevctlTimeout);
data->mdevctlTimeout = virEventAddTimeout(100, launchMdevctlUpdateThread,
data, NULL);
--
2.34.1