From 2b3bbbc1b7f8723c4947c6d1e4fb43cabc25fb2e Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Fri, 24 Jul 2020 16:30:06 +0200 Subject: [PATCH 2/4] meson: drop debug_logs configure argument There is no point of having this option in libvirt because the debug logs can be configured using log filters. origin commit: https://gitlab.com/libvirt/libvirt/-/commit/da6d644ea7b49500680a3d4a403571234fecefad Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa Signed-off-by: Chenxi Mao --- configure.ac | 3 --- m4/virt-debug.m4 | 33 --------------------------------- src/util/virlog.h | 23 +---------------------- tools/virsh.c | 2 -- tools/virt-admin.c | 2 -- 5 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 m4/virt-debug.m4 diff --git a/configure.ac b/configure.ac index cb62e5aac8..93d13496f3 100644 --- a/configure.ac +++ b/configure.ac @@ -496,7 +496,6 @@ dnl dnl Miscellaneous checks dnl -LIBVIRT_ARG_DEBUG LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT @@ -509,7 +508,6 @@ LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG -LIBVIRT_CHECK_DEBUG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT @@ -1038,7 +1036,6 @@ LIBVIRT_RESULT([Coverage], [$enable_test_coverage]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DEBUG LIBVIRT_RESULT([Use -Werror], [$enable_werror]) LIBVIRT_RESULT([Warning Flags], [$WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE diff --git a/m4/virt-debug.m4 b/m4/virt-debug.m4 deleted file mode 100644 index d3ac0564f2..0000000000 --- a/m4/virt-debug.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The debug check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_DEBUG], [ - LIBVIRT_ARG_ENABLE([DEBUG], [enable debugging output], [yes]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DEBUG], [ - AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes") - if test x"$enable_debug" = x"yes"; then - AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_DEBUG], [ - LIBVIRT_RESULT([Debug], [$enable_debug]) -]) diff --git a/src/util/virlog.h b/src/util/virlog.h index feb2f85904..716fb9a378 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -78,29 +78,8 @@ struct _virLogSource { .serial = 0, \ } -/* - * If configured with --enable-debug=yes then library calls - * are printed to stderr for debugging or to an appropriate channel - * defined at runtime from the libvirt daemon configuration file - */ -#ifdef ENABLE_DEBUG -# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \ +#define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \ virLogMessage(src, VIR_LOG_DEBUG, filename, linenr, funcname, NULL, __VA_ARGS__) -#else -/** - * virLogEatParams: - * - * Do nothing but eat parameters. - */ -static inline void virLogEatParams(virLogSourcePtr unused, ...) -{ - /* Silence gcc */ - unused = unused; -} -# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \ - virLogEatParams(src, filename, linenr, funcname, __VA_ARGS__) -#endif /* !ENABLE_DEBUG */ - #define VIR_INFO_INT(src, filename, linenr, funcname, ...) \ virLogMessage(src, VIR_LOG_INFO, filename, linenr, funcname, NULL, __VA_ARGS__) #define VIR_WARN_INT(src, filename, linenr, funcname, ...) \ diff --git a/tools/virsh.c b/tools/virsh.c index 197a90636d..06ff5e8336 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -614,9 +614,7 @@ virshShowVersion(vshControl *ctl G_GNUC_UNUSED) #ifdef WITH_SECRETS vshPrint(ctl, " Secrets"); #endif -#ifdef ENABLE_DEBUG vshPrint(ctl, " Debug"); -#endif #ifdef WITH_DTRACE_PROBES vshPrint(ctl, " DTrace"); #endif diff --git a/tools/virt-admin.c b/tools/virt-admin.c index a8e5e0a5af..df23330ee1 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1277,9 +1277,7 @@ vshAdmShowVersion(vshControl *ctl G_GNUC_UNUSED) #ifdef WITH_LIBVIRTD vshPrint(ctl, " Daemon"); #endif -#ifdef ENABLE_DEBUG vshPrint(ctl, " Debug"); -#endif #if WITH_READLINE vshPrint(ctl, " Readline"); #endif -- 2.33.0