Cole Robinson wrote:
On 10/23/2009 07:01 AM, Chris Lalancette wrote:
> (original patch from Charles Duffy)
>
> Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
> ---
> daemon/libvirtd.c | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
> index 03bc1b4..4eb33bc 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);
ACK
Thanks, committed.
--
Chris Lalancette