aboutsummaryrefslogtreecommitdiff
path: root/qga
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2015-10-02 14:58:14 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-10-19 18:28:06 -0500
commit8e34bf364ae518503642d28bdd43661090ae21bd (patch)
treef4bd31b55d4df405ea66d71ca09f2c85ae147005 /qga
parentf3a06403b82c7f036564e4caf18b52ce6885fcfb (diff)
downloadqemu-arm-8e34bf364ae518503642d28bdd43661090ae21bd.tar.gz
qga: add QGA_CONF environment variable
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 <marcandre.lureau@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga')
-rw-r--r--qga/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/qga/main.c b/qga/main.c
index d8e063a4a3..18e1e1dc57 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)) {