From: John Ferlan <jferlan@redhat.com>
Date: Wed, 22 Mar 2017 11:58:05 +0000 (-0400)
Subject: util: Remove NONNULL's for virNetDevVPortProfile[Associate|Disassociate]
X-Git-Tag: v3.2.0-rc1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5482db8176f8737cb69998a93ba7bed15e2d1c56;p=thirdparty%2Flibvirt.git

util: Remove NONNULL's for virNetDevVPortProfile[Associate|Disassociate]

The source code will check for NULL arguments for 'macvtap_macaddr' and
'vmuuid', so no need for the NONNULL in the prototypes. Following the stack
for both arguments to virNetDevVPortProfileOpSetLink also shows called
functions would handle a NULL value.

Additionally, modified the prototype to use the same 'macvtap_macaddr'
name as the source code for consistency.
---

diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index dc3e6438ac..b706c41193 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -95,23 +95,21 @@ int virNetDevVPortProfileMerge3(virNetDevVPortProfilePtr *result,
 
 int virNetDevVPortProfileAssociate(const char *ifname,
                                    const virNetDevVPortProfile *virtPort,
-                                   const virMacAddr *macaddr,
+                                   const virMacAddr *macvtap_macaddr,
                                    const char *linkdev,
                                    int vf,
                                    const unsigned char *vmuuid,
                                    virNetDevVPortProfileOp vmOp,
                                    bool setlink_only)
-    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(6)
-    ATTRIBUTE_RETURN_CHECK;
+    ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;
 
 int virNetDevVPortProfileDisassociate(const char *ifname,
                                       const virNetDevVPortProfile *virtPort,
-                                      const virMacAddr *macaddr,
+                                      const virMacAddr *macvtap_macaddr,
                                       const char *linkdev,
                                       int vf,
                                       virNetDevVPortProfileOp vmOp)
-    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
-    ATTRIBUTE_RETURN_CHECK;
+    ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;
 
 
 #endif /* __VIR_NETDEV_VPORT_PROFILE_H__ */