Skip to contentSkip to conversation

hw/usb: use g_clear_handle_id() for GSource cleanup

PATCH New Matthew Penney 1 participant 1 message Apr 8

lore
Share & tools
lore
#0 lore raw

PATCH 2/8 hw/usb: use g_clear_handle_id() for GSource cleanup

Use g_clear_handle_id() instead of g_source_remove() with manual ID checking and zeroing.

This simplifies the code and ensures consistent handling of GSource IDs, since g_clear_handle_id() checks for a non-zero ID before calling the cleanup function and zeros it afterwards.

No functional change intended.

---
 hw/usb/redirect.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
hw/usb/redirect.c +2 -7
index fda5bbca67..bde821e214 100644
@@ -1226,10 +1226,7 @@ static void usbredir_chardev_close_bh(void *opaque)
         usbredirparser_destroy(dev->parser);
         dev->parser = NULL;
     }
-    if (dev->watch) {
-        g_source_remove(dev->watch);
-        dev->watch = 0;
-    }
+    g_clear_handle_id(&dev->watch, g_source_remove);
 }
 
 static void usbredir_create_parser(USBRedirDevice *dev)
@@ -1494,9 +1491,7 @@ static void usbredir_unrealize(USBDevice *udev)
     if (dev->parser) {
         usbredirparser_destroy(dev->parser);
     }
-    if (dev->watch) {
-        g_source_remove(dev->watch);
-    }
+    g_clear_handle_id(&dev->watch, g_source_remove);
 
     free(dev->filter_rules);
     qemu_del_vm_change_state_handler(dev->vmstate);
Signature · 1 line
2.53.0