From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Subject: [PATCH 11/13] qga: relocate path to default configuration and hook
Date: Tue, 1 Sep 2020 02:20:18 -0400 [thread overview]
Message-ID: <20200901062020.26660-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20200901062020.26660-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/main.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index 3febf3b0fd..740f5f7303 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -29,6 +29,7 @@
#include "qapi/error.h"
#include "channel.h"
#include "qemu/bswap.h"
+#include "qemu/cutils.h"
#include "qemu/help_option.h"
#include "qemu/sockets.h"
#include "qemu/systemd.h"
@@ -968,7 +969,7 @@ static void config_load(GAConfig *config)
{
GError *gerr = NULL;
GKeyFile *keyfile;
- const char *conf = g_getenv("QGA_CONF") ?: QGA_CONF_DEFAULT;
+ g_autofree char *conf = g_strdup(g_getenv("QGA_CONF")) ?: get_relocated_path(QGA_CONF_DEFAULT);
/* read system config */
keyfile = g_key_file_new();
@@ -1027,7 +1028,7 @@ end:
if (gerr &&
!(gerr->domain == G_FILE_ERROR && gerr->code == G_FILE_ERROR_NOENT)) {
g_critical("error loading configuration from path: %s, %s",
- QGA_CONF_DEFAULT, gerr->message);
+ conf, gerr->message);
exit(EXIT_FAILURE);
}
g_clear_error(&gerr);
@@ -1141,7 +1142,7 @@ static void config_parse(GAConfig *config, int argc, char **argv)
#ifdef CONFIG_FSFREEZE
case 'F':
g_free(config->fsfreeze_hook);
- config->fsfreeze_hook = g_strdup(optarg ?: QGA_FSFREEZE_HOOK_DEFAULT);
+ config->fsfreeze_hook = g_strdup(optarg) ?: get_relocated_path(QGA_FSFREEZE_HOOK_DEFAULT);
break;
#endif
case 't':
@@ -1463,6 +1464,7 @@ int main(int argc, char **argv)
config->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL;
+ qemu_init_exec_dir(argv[0]);
qga_qmp_init_marshal(&ga_commands);
init_dfl_pathnames();
--
2.26.2
next prev parent reply other threads:[~2020-09-01 6:26 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 6:20 [PATCH 00/13] Make QEMU installation relocatable Paolo Bonzini
2020-09-01 6:20 ` [PATCH 01/13] fuzz: use qemu_get_exec_dir Paolo Bonzini
2020-09-01 9:18 ` Thomas Huth
2020-09-01 14:36 ` Alexander Bulekov
2020-09-01 6:20 ` [PATCH 02/13] oslib: do not call g_strdup from qemu_get_exec_dir Paolo Bonzini
2020-09-02 10:30 ` Thomas Huth
2020-09-01 6:20 ` [PATCH 03/13] oslib-posix: default exec_dir to bindir Paolo Bonzini
2020-09-01 18:04 ` Richard Henderson
2020-09-01 18:40 ` Paolo Bonzini
2020-09-01 6:20 ` [PATCH 04/13] cutils: introduce get_relocated_path Paolo Bonzini
2020-09-01 6:20 ` [PATCH 05/13] oslib-posix: relocate path to /var Paolo Bonzini
2020-09-02 8:20 ` Philippe Mathieu-Daudé
2020-09-01 6:20 ` [PATCH 06/13] module: relocate path to modules Paolo Bonzini
2020-09-01 6:20 ` [PATCH 07/13] net: relocate paths to helpers and scripts Paolo Bonzini
2020-09-02 8:24 ` Philippe Mathieu-Daudé
2020-09-02 8:40 ` Paolo Bonzini
2020-09-01 6:20 ` [PATCH 08/13] vl: relocate paths to data directories Paolo Bonzini
2020-09-02 8:28 ` Philippe Mathieu-Daudé
2020-09-02 8:35 ` Paolo Bonzini
2020-09-02 8:41 ` Philippe Mathieu-Daudé
2020-09-01 6:20 ` [PATCH 09/13] vl: relocate path to configuration file Paolo Bonzini
2020-09-02 8:28 ` Philippe Mathieu-Daudé
2020-09-01 6:20 ` [PATCH 10/13] qemu-bridge-helper: relocate path to default ACL Paolo Bonzini
2020-09-01 6:20 ` Paolo Bonzini [this message]
2020-09-01 6:20 ` [PATCH 12/13] ui: relocate paths to icons and translations Paolo Bonzini
2020-09-02 8:29 ` Philippe Mathieu-Daudé
2020-09-01 6:20 ` [PATCH 13/13] configure: use a platform-neutral prefix Paolo Bonzini
2020-09-01 21:14 ` [PATCH 00/13] Make QEMU installation relocatable Mark Cave-Ayland
2020-09-01 21:22 ` Paolo Bonzini
2020-09-02 6:09 ` Mark Cave-Ayland
2020-09-02 6:42 ` Paolo Bonzini
2020-09-02 11:42 ` Mark Cave-Ayland
2020-09-02 11:45 ` Mark Cave-Ayland
2020-09-02 12:16 ` Paolo Bonzini
2020-09-02 18:45 ` Mark Cave-Ayland
2020-09-02 20:20 ` Paolo Bonzini
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=20200901062020.26660-12-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--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).