External/libvirt
1
0
Fork 0
Code

m4: virt-netcf: bump minimal version to 0.1.8

Browse Source 
This version is available on all supported OSes and includes the
transaction APIs.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Pavel Hrdina 2019-10-09 14:47:34 +02:00
parent c7f8a66b22
commit 3365cdf8a8
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
m4/virt-netcf.m4
View File

@ -18,25 +18,11 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_ARG_NETCF],[ AC_DEFUN([LIBVIRT_ARG_NETCF],[
LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.4]) LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8])
]) ])
AC_DEFUN([LIBVIRT_CHECK_NETCF],[ AC_DEFUN([LIBVIRT_CHECK_NETCF],[
LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4]) LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8])
if test "$with_netcf" = "yes" ; then
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
CFLAGS="$CFLAGS $NETCF_CFLAGS"
LIBS="$LIBS $NETCF_LIBS"
AC_CHECK_FUNC([ncf_change_begin], [netcf_transactions=1], [netcf_transactions=0])
if test "$netcf_transactions" = "1" ; then
AC_DEFINE_UNQUOTED([HAVE_NETCF_TRANSACTIONS], [1],
[we have sufficiently new version of netcf for transaction network API])
fi
CFLAGS="$old_CFLAGS"
LIBS="$old_LIBS"
fi
]) ])
AC_DEFUN([LIBVIRT_RESULT_NETCF],[ AC_DEFUN([LIBVIRT_RESULT_NETCF],[

4
src/interface/interface_backend_netcf.c
View File

@ -1117,7 +1117,6 @@ static int netcfInterfaceIsActive(virInterfacePtr ifinfo)
return ret; return ret;
} }
#ifdef HAVE_NETCF_TRANSACTIONS
static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
{ {
int ret; int ret;
@ -1192,7 +1191,6 @@ static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int flags)
virObjectUnlock(driver); virObjectUnlock(driver);
return ret; return ret;
} }
#endif /* HAVE_NETCF_TRANSACTIONS */
static virInterfaceDriver interfaceDriver = { static virInterfaceDriver interfaceDriver = {
.name = INTERFACE_DRIVER_NAME, .name = INTERFACE_DRIVER_NAME,
@ -1209,11 +1207,9 @@ static virInterfaceDriver interfaceDriver = {
.interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
.interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
.interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
#ifdef HAVE_NETCF_TRANSACTIONS
.interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */ .interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */
.interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */ .interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */
.interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */ .interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */
#endif /* HAVE_NETCF_TRANSACTIONS */
}; };