diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-10-02 14:58:15 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-10-19 18:28:06 -0500 |
| commit | 6eaeae37a5fdd0a1ef88ed9ab4b807669ffc0e2d (patch) | |
| tree | 9d8353aae7ee4b9eaacac150354d4388a57f70f8 | |
| parent | 8e34bf364ae518503642d28bdd43661090ae21bd (diff) | |
| download | focaccia-qemu-6eaeae37a5fdd0a1ef88ed9ab4b807669ffc0e2d.tar.gz focaccia-qemu-6eaeae37a5fdd0a1ef88ed9ab4b807669ffc0e2d.zip | |
qga: do not override configuration verbosity
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 <marcandre.lureau@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qga/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qga/main.c b/qga/main.c index 18e1e1dc57..aa6a063446 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; + module_call_init(MODULE_INIT_QAPI); init_dfl_pathnames(); |