diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6300178ccd..4fb2e2a75b 100644 --- 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 1cd5100c12..b72257b970 100644 --- 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 b5963ace0f..e0d56886bc 100644 --- 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 5251dc0bc9..3a1b9e1fe1 100644 --- 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 fe7bf34cb8..027cb6477c 100644 --- 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;