From 947a51ee94bcbf47aa47c4ef0e72bda2321072c8 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Wed, 22 Aug 2012 16:00:28 -0400 Subject: [PATCH] util: eliminate erroneous VIR_WARNs in (eb|ip)tables.c Several VIR_DEBUG()'s were changed to VIR_WARN() while I was testing the firewalld support patch, and I neglected to change them back before I pushed. In the meantime I've decided that it would be useful to have them be VIR_INFO(), just so there will be logged evidence of which method is being used (firewall-cmd vs. (eb|ip)tables) without needing to crank logging to 11. (at most this adds 2 lines to libvirtd's logs per libvirtd start). --- src/util/ebtables.c | 6 +++--- src/util/iptables.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/ebtables.c b/src/util/ebtables.c index 1a78f891ff..3e27bb6f44 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -55,7 +55,7 @@ virEbTablesOnceInit(void) { firewall_cmd_path = virFindFileInPath("firewall-cmd"); if (!firewall_cmd_path) { - VIR_WARN("firewall-cmd not found on system. " + VIR_INFO("firewall-cmd not found on system. " "firewalld support disabled for ebtables."); } else { virCommandPtr cmd = virCommandNew(firewall_cmd_path); @@ -63,11 +63,11 @@ virEbTablesOnceInit(void) virCommandAddArgList(cmd, "--state", NULL); if (virCommandRun(cmd, &status) < 0 || status != 0) { - VIR_WARN("firewall-cmd found but disabled for ebtables"); + VIR_INFO("firewall-cmd found but disabled for ebtables"); VIR_FREE(firewall_cmd_path); firewall_cmd_path = NULL; } else { - VIR_WARN("using firewalld for ebtables commands"); + VIR_INFO("using firewalld for ebtables commands"); } virCommandFree(cmd); } diff --git a/src/util/iptables.c b/src/util/iptables.c index d8fdd3b425..dee1d26c0d 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -53,7 +53,7 @@ virIpTablesOnceInit(void) { firewall_cmd_path = virFindFileInPath("firewall-cmd"); if (!firewall_cmd_path) { - VIR_WARN("firewall-cmd not found on system. " + VIR_INFO("firewall-cmd not found on system. " "firewalld support disabled for iptables."); } else { virCommandPtr cmd = virCommandNew(firewall_cmd_path); @@ -61,11 +61,11 @@ virIpTablesOnceInit(void) virCommandAddArgList(cmd, "--state", NULL); if (virCommandRun(cmd, &status) < 0 || status != 0) { - VIR_WARN("firewall-cmd found but disabled for iptables"); + VIR_INFO("firewall-cmd found but disabled for iptables"); VIR_FREE(firewall_cmd_path); firewall_cmd_path = NULL; } else { - VIR_WARN("using firewalld for iptables commands"); + VIR_INFO("using firewalld for iptables commands"); } virCommandFree(cmd); }