From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sun, 23 Apr 2017 14:53:37 +0000 (+0400)
Subject: util: relax virNetDevSetCoalesce() stub
X-Git-Tag: v3.3.0-rc1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e010605d15003aa61800f79752c6e586939e58c;p=thirdparty%2Flibvirt.git

util: relax virNetDevSetCoalesce() stub

Currently, virNetDevSetCoalesce() stub is always returning error. As
it's used by virNetDevTapCreateInBridgePort(), it essentially breaks
bridged networking if coalesce is not supported.

To make it work, relax the stub to trigger error only when its
coalesce argument is not NULL, otherwise report success.
---

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 131a56a8dc..e75a1c9705 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -3155,8 +3155,11 @@ int virNetDevSetCoalesce(const char *ifname,
 }
 # else
 int virNetDevSetCoalesce(const char *ifname,
-                         virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED)
+                         virNetDevCoalescePtr coalesce)
 {
+    if (!coalesce)
+        return 0;
+
     virReportSystemError(ENOSYS,
                          _("Cannot set coalesce info on interface '%s'"),
                          ifname);
@@ -3213,8 +3216,11 @@ virNetDevGetFeatures(const char *ifname ATTRIBUTE_UNUSED,
 }
 
 int virNetDevSetCoalesce(const char *ifname,
-                         virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED)
+                         virNetDevCoalescePtr coalesce)
 {
+    if (!coalesce)
+        return 0;
+
     virReportSystemError(ENOSYS,
                          _("Cannot set coalesce info on interface '%s'"),
                          ifname);