From 212df3f9573f7284d361f855bb6e476e5a0259e6 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Fri, 14 Sep 2018 13:33:04 -0600 Subject: [PATCH] libxl: remove configure check for libxl_domain_config_from_json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The libxl_domain_config_from_json API appeared in Xen 4.5, hence there is no need to check for its existence after changing the minimum supported Xen version to 4.6. Remove the check and its use in the tests. Signed-off-by: Jim Fehlig Reviewed-by: Ján Tomko --- m4/virt-driver-libxl.m4 | 7 ------- tests/libxlxml2domconfigtest.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 902da11472..70c5c59e6a 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -56,13 +56,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ ],[ LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxenctrl" ]) - - dnl Check if libxl_domain_config_from_json is available for domXML to - dnl libxl_domain_config tests - LIBS="$LIBS -lxenlight -lxenctrl" - AC_CHECK_FUNCS([libxl_domain_config_from_json]) - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" fi AC_SUBST([LIBXL_CFLAGS]) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index b814461acc..eacf8f5615 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -33,7 +33,7 @@ #include "testutils.h" -#if defined(WITH_LIBXL) && defined(WITH_YAJL) && defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON) +#if defined(WITH_LIBXL) && defined(WITH_YAJL) # include "internal.h" # include "viralloc.h" @@ -228,4 +228,4 @@ int main(void) return EXIT_AM_SKIP; } -#endif /* WITH_LIBXL && WITH_YAJL && HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON */ +#endif /* WITH_LIBXL && WITH_YAJL */ -- GitLab