[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 04/14] qga: do not override configuration verbosit
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL v4 04/14] qga: do not override configuration verbosity |
Date: |
Mon, 19 Oct 2015 18:38:09 -0500 |
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>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <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;
+
module_call_init(MODULE_INIT_QAPI);
init_dfl_pathnames();
--
1.9.1
- [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 09/14] qga: drop guest_file_init helper and replace it with static initializers, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 10/14] qga: guest exec functionality, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 03/14] qga: add QGA_CONF environment variable, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 12/14] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all(), Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 13/14] qga: guest-exec simple stdin/stdout/stderr redirection, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 07/14] qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 11/14] qga: handle possible SIGPIPE in guest-file-write, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 14/14] qga: fix uninitialized value warning for win32, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 05/14] qtest: add a few fd-level qmp helpers, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 04/14] qga: do not override configuration verbosity,
Michael Roth <=
- [Qemu-devel] [PULL v4 01/14] build: qemu-ga: add 'qemu-ga' build target for w32, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 02/14] qga: Use g_new() & friends where that makes obvious sense, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 06/14] glib-compat: add 2.38/2.40/2.46 asserts, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 08/14] tests: add a local test for guest agent, Michael Roth, 2015/10/19
- Re: [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue, Peter Maydell, 2015/10/20