virnetdevmacvlan: Drop G_GNUC_WARN_UNUSED_RESULT annotation for virNetDevMacVLanDelet...

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 538fa502c40b62e3384e6c18cfe6458946ee45da..c490e2b97a50cb00a698dba5f0dbc4267d095874 100644 (file)
--- 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 4afd12e3fa859b613f7fd5f6f1f69ce315c1aae3..9a31a11acc893541d0e761f5f6463dfd394a293c 100644 (file)
--- 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 29bb8123f45106ebbfdc9f60db4773bda249182c..a5c34d6417644117042692823afd03a7895c5757 100644 (file)
--- 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,