]> xenbits.xensource.com Git - libvirt.git/commitdiff
processNicRxFilterChangedEvent: Free @guestFilter and @hostFilter automatically
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 30 Sep 2022 13:55:46 +0000 (15:55 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 20 Oct 2022 06:44:33 +0000 (08:44 +0200)
There's no need to call virNetDevRxFilterFree() explicitly, when
corresponding variables can be declared as
g_autoptr(virNetDevRxFilter).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_driver.c

index 833b32e5ef4ae36c7ecfdd40cc9f45ab6075d80b..673d582cbe99ec59fd335b254e7358f9a97604c5 100644 (file)
@@ -3817,8 +3817,8 @@ processNicRxFilterChangedEvent(virDomainObj *vm,
     qemuDomainObjPrivate *priv = vm->privateData;
     virDomainDeviceDef dev;
     virDomainNetDef *def;
-    virNetDevRxFilter *guestFilter = NULL;
-    virNetDevRxFilter *hostFilter = NULL;
+    g_autoptr(virNetDevRxFilter) guestFilter = NULL;
+    g_autoptr(virNetDevRxFilter) hostFilter = NULL;
     int ret;
 
     VIR_DEBUG("Received NIC_RX_FILTER_CHANGED event for device %s "
@@ -3826,7 +3826,7 @@ processNicRxFilterChangedEvent(virDomainObj *vm,
               devAlias, vm, vm->def->name);
 
     if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0)
-        goto cleanup;
+        return;
 
     if (!virDomainObjIsActive(vm)) {
         VIR_DEBUG("Domain is not running");
@@ -3907,10 +3907,6 @@ processNicRxFilterChangedEvent(virDomainObj *vm,
 
  endjob:
     virDomainObjEndJob(vm);
-
- cleanup:
-    virNetDevRxFilterFree(hostFilter);
-    virNetDevRxFilterFree(guestFilter);
 }