[PATCH v1 06/20] node_device_udev: Test for mdevctlTimeout != -1

[Marc Hartmayer]

It is done a little differently everywhere in libvirt, but most common is to
test for != -1.

Reviewed-by: Boris Fiuczynski <fiu...@linux.ibm.com>
Reviewed-by: Jonathon Jongsma <jjong...@redhat.com>
Signed-off-by: Marc Hartmayer <mhart...@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 4ccef628d84c..049501c62870 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;
 }
@@ -2087,7 +2088,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;
     }
@@ -2197,7 +2198,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
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-le...@lists.libvirt.org