[libvirt] [PATCH 03/25] m4: virt-netcf: bump minimal version to 0.1.8

This version is available on all supported OSes and includes the transaction APIs. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-netcf.m4 | 18 ++---------------- src/interface/interface_backend_netcf.c | 4 ---- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 index 588b5e7a91..ada6b5a7a9 100644 --- a/m4/virt-netcf.m4 +++ b/m4/virt-netcf.m4 @@ -18,25 +18,11 @@ dnl <http://www.gnu.org/licenses/>;. dnl 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],[ - LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4]) - - 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 + LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8]) ]) AC_DEFUN([LIBVIRT_RESULT_NETCF],[ diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 00b5c00822..1db0190a79 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -1124,7 +1124,6 @@ static int netcfInterfaceIsActive(virInterfacePtr ifinfo) return ret; } -#ifdef HAVE_NETCF_TRANSACTIONS static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { int ret; @@ -1199,7 +1198,6 @@ static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) virObjectUnlock(driver); return ret; } -#endif /* HAVE_NETCF_TRANSACTIONS */ static virInterfaceDriver interfaceDriver = { .name = INTERFACE_DRIVER_NAME, @@ -1216,11 +1214,9 @@ static virInterfaceDriver interfaceDriver = { .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ -#ifdef HAVE_NETCF_TRANSACTIONS .interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */ .interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */ .interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */ -#endif /* HAVE_NETCF_TRANSACTIONS */ }; -- 2.21.0