Re: [Qemu-devel] [PATCH v2 2/4] qga: do not override configuration verbosity

[Michael Roth]

Quoting address@hidden (2015-09-11 13:53:39)
> From: Marc-André Lureau <address@hidden>
> 
> Move the default verbosity settings before loading the configuration
> file, or it will overwrite it. Found thanks to writing qga tests :)
> 
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  qga/main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/qga/main.c b/qga/main.c
> index 18e1e1d..aa6a063 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -1083,8 +1083,6 @@ static void config_parse(GAConfig *config, int argc, 
> char **argv)
>          { NULL, 0, NULL, 0 }
>      };
> 
> -    config->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL;
> -
>      while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
>          switch (ch) {
>          case 'm':
> @@ -1332,6 +1330,8 @@ int main(int argc, char **argv)
>      GAState *s = g_new0(GAState, 1);
>      GAConfig *config = g_new0(GAConfig, 1);
> 
> +    config->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL;
> +

We currently handle config->state_dir/method/channel_path defaults
after config_parse via if (!config->blah) config->blah = ...; I'd
rather we do it for this too for consistency, but not sure we have
a reliable indicator for determining whether or not config->log_level
is unset (GLogLevelFlags enum doesn't have a 0 value so that would
work, but it's hacky to make such an assumption).

This avoids any hacks so it's worth the trade-off in terms of
consistency so:

Reviewed-by: Michael Roth <address@hidden>

>      module_call_init(MODULE_INIT_QAPI);
> 
>      init_dfl_pathnames();
> -- 
> 2.4.3
>