From: Chris Lalancette <clalance@redhat.com>
Date: Fri, 23 Oct 2009 06:56:21 +0000 (+0200)
Subject: Add a default log_level to qemudSetLogging to remove a build warning.
X-Git-Tag: v0.7.3~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a9249c952750c15a5fe104b61f127b26676f7f;p=thirdparty%2Flibvirt.git

Add a default log_level to qemudSetLogging to remove a build warning.

(original patch from Charles Duffy)

Signed-off-by: Chris Lalancette <clalance@redhat.com>
---

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 03bc1b459a..4eb33bcd12 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -2509,8 +2509,9 @@ remoteReadSaslAllowedUsernameList (virConfPtr conf ATTRIBUTE_UNUSED,
  * debugging is asked for then output informations or debug.
  */
 static int
-qemudSetLogging(virConfPtr conf, const char *filename) {
-    int log_level;
+qemudSetLogging(virConfPtr conf, const char *filename)
+{
+    int log_level = 0;
     char *log_filters = NULL;
     char *log_outputs = NULL;
     int ret = -1;
@@ -2531,12 +2532,6 @@ qemudSetLogging(virConfPtr conf, const char *filename) {
      * level has been set, we must process variables in the opposite
      * order, each one overriding the previous.
      */
-    /*
-     * GET_CONF_INT returns 0 when there is no log_level setting in
-     * the config file. The conditional below eliminates a false
-     * warning in that case, but also has the side effect of missing
-     * a warning if the user actually does say log_level=0.
-     */
     GET_CONF_INT (conf, filename, log_level);
     if (log_level != 0)
         virLogSetDefaultPriority(log_level);