From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 1 Feb 2023 12:29:37 +0000 (+0100)
Subject: virnetdevmacvlan: Drop G_GNUC_WARN_UNUSED_RESULT annotation for virNetDevMacVLanDelet... 
X-Git-Tag: v9.1.0-rc1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0f671e7c9884bc332456f3008501b39be069b22;p=thirdparty%2Flibvirt.git

virnetdevmacvlan: Drop G_GNUC_WARN_UNUSED_RESULT annotation for virNetDevMacVLanDeleteWithVPortProfile()

Every single caller of the
virNetDevMacVLanDeleteWithVPortProfile() function is calling it
wrapped inside of ignore_value() macro. This is because the
function is annotated as G_GNUC_WARN_UNUSED_RESULT. This makes no
sense. Drop the annotation and the macro envelope.

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

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 538fa502c4..c490e2b97a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1378,12 +1378,11 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
             virErrorRestore(&originalError);
 
             if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
-                ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
-                                 net->ifname, &net->mac,
-                                 virDomainNetGetActualDirectDev(net),
-                                 virDomainNetGetActualDirectMode(net),
-                                 virDomainNetGetActualVirtPortProfile(net),
-                                 cfg->stateDir));
+                virNetDevMacVLanDeleteWithVPortProfile(net->ifname, &net->mac,
+                                                       virDomainNetGetActualDirectDev(net),
+                                                       virDomainNetGetActualDirectMode(net),
+                                                       virDomainNetGetActualVirtPortProfile(net),
+                                                       cfg->stateDir);
             }
 
             qemuDomainNetDeviceVportRemove(net);
@@ -4653,12 +4652,11 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver,
     }
 
     if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) {
-        ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
-                         net->ifname, &net->mac,
-                         virDomainNetGetActualDirectDev(net),
-                         virDomainNetGetActualDirectMode(net),
-                         virDomainNetGetActualVirtPortProfile(net),
-                         cfg->stateDir));
+        virNetDevMacVLanDeleteWithVPortProfile(net->ifname, &net->mac,
+                                               virDomainNetGetActualDirectDev(net),
+                                               virDomainNetGetActualDirectMode(net),
+                                               virDomainNetGetActualVirtPortProfile(net),
+                                               cfg->stateDir);
     }
 
     if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4afd12e3fa..9a31a11acc 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8443,12 +8443,11 @@ void qemuProcessStop(virQEMUDriver *driver,
         vport = virDomainNetGetActualVirtPortProfile(net);
         switch (virDomainNetGetActualType(net)) {
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-            ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
-                             net->ifname, &net->mac,
-                             virDomainNetGetActualDirectDev(net),
-                             virDomainNetGetActualDirectMode(net),
-                             virDomainNetGetActualVirtPortProfile(net),
-                             cfg->stateDir));
+            virNetDevMacVLanDeleteWithVPortProfile(net->ifname, &net->mac,
+                                                   virDomainNetGetActualDirectDev(net),
+                                                   virDomainNetGetActualDirectMode(net),
+                                                   virDomainNetGetActualVirtPortProfile(net),
+                                                   cfg->stateDir);
             break;
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             if (net->managed_tap != VIR_TRISTATE_BOOL_NO && net->ifname) {
diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index 29bb8123f4..a5c34d6417 100644
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -92,7 +92,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
                                            const virNetDevVPortProfile *virtPortProfile,
                                            char *stateDir)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    ATTRIBUTE_NONNULL(6) G_GNUC_WARN_UNUSED_RESULT;
+    ATTRIBUTE_NONNULL(6);
 
 int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname,
                                             const virMacAddr *macaddress,