From: Michal Privoznik <[email protected]> We really don't want our test suite talking to kernel and setting various attributes on NICs.
Signed-off-by: Michal Privoznik <[email protected]> --- src/util/virnetdev.h | 5 +++-- tests/virnetdevmock.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 1da1795487..424d4c0e52 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -248,7 +248,8 @@ int virNetDevGetVirtualFunctions(const char *pfname, int virNetDevSaveNetConfig(const char *linkdev, int vf, const char *stateDir, bool saveVlan) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT + ATTRIBUTE_MOCKABLE; int virNetDevReadNetConfig(const char *linkdev, int vf, @@ -265,7 +266,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf, const virNetDevVlan *vlan, const virMacAddr *MAC, bool setVLan) - ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE; int virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname, int *vf) diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 910009d80c..c45b89288b 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -33,6 +33,28 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, NET_DEV_TEST_DATA_PREFIX, ifname, file); return 0; } + + +int +virNetDevSaveNetConfig(const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + const char *stateDir G_GNUC_UNUSED, + bool saveVlan G_GNUC_UNUSED) +{ + return 0; +} + + +int +virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + const virMacAddr *adminMAC G_GNUC_UNUSED, + const virNetDevVlan *vlan G_GNUC_UNUSED, + const virMacAddr *MAC G_GNUC_UNUSED, + bool setVLan G_GNUC_UNUSED) +{ + return 0; +} #else /* Nothing to override on non-__linux__ platforms */ #endif -- 2.52.0
