[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 03/14] qga: add QGA_CONF environment variable
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL v4 03/14] qga: add QGA_CONF environment variable |
Date: |
Mon, 19 Oct 2015 18:38:08 -0500 |
From: Marc-André Lureau <address@hidden>
Having a environment variable allows to override default configuration
path, useful for testing. Note that this can't easily be an argument,
since loading config is done before parsing the arguments.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
qga/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/qga/main.c b/qga/main.c
index d8e063a..18e1e1d 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -945,10 +945,11 @@ static void config_load(GAConfig *config)
{
GError *gerr = NULL;
GKeyFile *keyfile;
+ const char *conf = g_getenv("QGA_CONF") ?: QGA_CONF_DEFAULT;
/* read system config */
keyfile = g_key_file_new();
- if (!g_key_file_load_from_file(keyfile, QGA_CONF_DEFAULT, 0, &gerr)) {
+ if (!g_key_file_load_from_file(keyfile, conf, 0, &gerr)) {
goto end;
}
if (g_key_file_has_key(keyfile, "general", "daemon", NULL)) {
--
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 <=
- [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, 2015/10/19
- [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