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.
Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
src/util/virnetdevvportprofile.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index dc3e643..b706c41 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__ */
--
2.9.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
