From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Michael Roth" <mdroth@linux.vnet.ibm.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PULL v4 04/14] qga: do not override configuration verbosity
Date: Mon, 19 Oct 2015 18:38:09 -0500 [thread overview]
Message-ID: <1445297899-20527-5-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1445297899-20527-1-git-send-email-mdroth@linux.vnet.ibm.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
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
next prev parent reply other threads:[~2015-10-19 23:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 23:38 [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 01/14] build: qemu-ga: add 'qemu-ga' build target for w32 Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 02/14] qga: Use g_new() & friends where that makes obvious sense Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 03/14] qga: add QGA_CONF environment variable Michael Roth
2015-10-19 23:38 ` Michael Roth [this message]
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 05/14] qtest: add a few fd-level qmp helpers Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 06/14] glib-compat: add 2.38/2.40/2.46 asserts Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 07/14] qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 08/14] tests: add a local test for guest agent Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 09/14] qga: drop guest_file_init helper and replace it with static initializers Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 10/14] qga: guest exec functionality Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 11/14] qga: handle possible SIGPIPE in guest-file-write Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 12/14] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all() Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 13/14] qga: guest-exec simple stdin/stdout/stderr redirection Michael Roth
2015-10-19 23:38 ` [Qemu-devel] [PULL v4 14/14] qga: fix uninitialized value warning for win32 Michael Roth
2015-10-20 9:52 ` [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue Peter Maydell
2015-10-20 11:55 ` Peter Maydell
2015-10-20 15:27 ` Michael Roth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445297899-20527-5-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).