util: keep track of full GSource object not source ID number

The source ID number is an alternative way to identify a source that has
been added to a GMainContext. Internally when a source ID is given, glib
will lookup the corresponding GSource and use that. The use of a source
ID is racy in some cases though, because it is invalid to continue to
use an ID number after the GSource has been removed. It is thus safer
to use the GSource object directly and have full control over the ref
counting and thus cleanup.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/util/vireventglibwatch.h b/src/util/vireventglibwatch.h
index 2f7e61cfba..f57be1f503 100644
--- a/src/util/vireventglibwatch.h
+++ b/src/util/vireventglibwatch.h
@@ -40,9 +40,10 @@ typedef gboolean (*virEventGLibSocketFunc)(int fd,
                                            GIOCondition condition,
                                            gpointer data);
 
-guint virEventGLibAddSocketWatch(int fd,
-                                 GIOCondition condition,
-                                 GMainContext *context,
-                                 virEventGLibSocketFunc func,
-                                 gpointer opaque,
-                                 GDestroyNotify notify);
+GSource *virEventGLibAddSocketWatch(int fd,
+                                    GIOCondition condition,
+                                    GMainContext *context,
+                                    virEventGLibSocketFunc func,
+                                    gpointer opaque,
+                                    GDestroyNotify notify)
+    G_GNUC_WARN_UNUSED_RESULT;