Drop inline keyword from some functions.

While trying to build with -Os I've encountered some build
failures.

util/vircommand.c: In function 'virCommandAddEnvFormat':
util/vircommand.c:1257:1: error: inlining failed in call to 'virCommandAddEnv': call is unlikely and code size would grow [-Werror=inline]
 virCommandAddEnv(virCommandPtr cmd, char *env)
 ^
util/vircommand.c:1308:5: error: called from here [-Werror=inline]
     virCommandAddEnv(cmd, env);
     ^
This function is big enough for the compiler to be not inlined.
This is the error message I'm seeing:

Then virDomainNumatuneNodeSpecified is exported and called from
other places. It shouldn't be inlined then.

In file included from network/bridge_driver_platform.h:30:0,
                 from network/bridge_driver_platform.c:26:
network/bridge_driver_linux.c: In function 'networkRemoveRoutingFirewallRules':
./conf/network_conf.h:350:1: error: inlining failed in call to 'virNetworkDefForwardIf.constprop': call is unlikely and code size would grow [-Werror=inline]
 virNetworkDefForwardIf(const virNetworkDef *def, size_t n)
 ^

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 6300178ccd3ee2f4039f35c2203117b1858ea4e4..4fb2e2a75b9df3d25fe378134156dd0ee683db53 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2925,6 +2925,14 @@ virNetworkObjFormat(virNetworkObjPtr net,
     return NULL;
 }
 
+const char *
+virNetworkDefForwardIf(const virNetworkDef *def, size_t n)
+{
+    return ((def->forward.ifs && (def->forward.nifs > n) &&
+             def->forward.ifs[n].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV)
+            ? def->forward.ifs[n].device.dev : NULL);
+}
+
 virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net,
                                           const char *portgroup)
 {

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 1cd5100c1278c338331945e4c261186d3ad93039..b72257b970a8449ba4067df775d001dea915398b 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -346,13 +346,7 @@ int virNetworkDefFormatBuf(virBufferPtr buf,
                            const virNetworkDef *def,
                            unsigned int flags);
 
-static inline const char *
-virNetworkDefForwardIf(const virNetworkDef *def, size_t n)
-{
-    return ((def->forward.ifs && (def->forward.nifs > n) &&
-             def->forward.ifs[n].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV)
-            ? def->forward.ifs[n].device.dev : NULL);
-}
+const char * virNetworkDefForwardIf(const virNetworkDef *def, size_t n);
 
 virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net,
                                           const char *portgroup);

diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index b5963ace0fc8b1b58411ffaa5979b7e1ac49105b..e0d56886bc60d1d255efbfe7c5a0a7a654a71b62 100644 (file)
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -72,7 +72,7 @@ struct _virDomainNuma {
 };
 
 
-inline bool
+bool
 virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
                                int cellid)
 {

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 5251dc0bc9e4b6ba57257bd6702a5cb6750c4968..3a1b9e1fe1b15c2e322413a6eee24acb0ac0ea0e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -589,6 +589,7 @@ virNetworkConfigFile;
 virNetworkDefCopy;
 virNetworkDefFormat;
 virNetworkDefFormatBuf;
+virNetworkDefForwardIf;
 virNetworkDefFree;
 virNetworkDefGetIpByIndex;
 virNetworkDefGetRouteByIndex;

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index fe7bf34cb834b08881296ff88fd81e87aa70017f..027cb6477cd46198483ec67d8c7c8cd4dc90c726 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -1253,7 +1253,7 @@ virCommandRawStatus(virCommandPtr cmd)
  * string like "name=value".  If the named environment variable is
  * already set, then it is replaced in the list.
  */
-static inline void
+static void
 virCommandAddEnv(virCommandPtr cmd, char *env)
 {
     size_t namelen;