From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Tue, 23 Apr 2024 18:08:52 +0000 (+0200)
Subject: node_device_udev: Test for mdevctlTimeout != -1
X-Git-Tag: v10.5.0-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1606d7ec99efb5af08d2689146a03869861a3f3c;p=thirdparty%2Flibvirt.git

node_device_udev: Test for mdevctlTimeout != -1

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

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 5cf4fbbfc2..3e3c20a6d4 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;
 }
@@ -2082,7 +2083,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;
     }
@@ -2192,7 +2193,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);