From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH v2 2/4] qga: do not override configuration verbosity
Date: Fri, 11 Sep 2015 20:53:39 +0200 [thread overview]
Message-ID: <1441997621-3284-3-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1441997621-3284-1-git-send-email-marcandre.lureau@redhat.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>
---
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();
--
2.4.3
next prev parent reply other threads:[~2015-09-11 18:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-11 18:53 [Qemu-devel] [PATCH v2 0/4] qga: add local tests on linux marcandre.lureau
2015-09-11 18:53 ` [Qemu-devel] [PATCH v2 1/4] qga: add QGA_CONF environment variable marcandre.lureau
2015-10-01 20:27 ` Michael Roth
2015-09-11 18:53 ` marcandre.lureau [this message]
2015-10-01 20:38 ` [Qemu-devel] [PATCH v2 2/4] qga: do not override configuration verbosity Michael Roth
2015-09-11 18:53 ` [Qemu-devel] [PATCH v2 3/4] qtest: add a few fd-level qmp helpers marcandre.lureau
2015-09-11 18:53 ` [Qemu-devel] [PATCH v2 4/4] tests: add a local test for guest agent marcandre.lureau
2015-10-01 21:36 ` Michael Roth
2015-10-01 22:24 ` Marc-André Lureau
2015-10-01 23:36 ` Michael Roth
2015-09-25 10:15 ` [Qemu-devel] [PATCH v2 0/4] qga: add local tests on linux Marc-André Lureau
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=1441997621-3284-3-git-send-email-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--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).