xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 19:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qga: do not override configuration verbosity

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2015-10-02 14:58:15 +02:00 committed by Michael Roth
parent 8e34bf364a
commit 6eaeae37a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qga/main.c
View File

@ -1083,8 +1083,6 @@ static void config_parse(GAConfig *config, int argc, char **argv)
{ NULL, 0, NULL, 0 } { 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) { while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
switch (ch) { switch (ch) {
case 'm': case 'm':
@ -1332,6 +1330,8 @@ int main(int argc, char **argv)
GAState *s = g_new0(GAState, 1); GAState *s = g_new0(GAState, 1);
GAConfig *config = g_new0(GAConfig, 1); GAConfig *config = g_new0(GAConfig, 1);
config->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL;
module_call_init(MODULE_INIT_QAPI); module_call_init(MODULE_INIT_QAPI);
init_dfl_pathnames(); init_dfl_pathnames();