From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 18 Aug 2020 09:59:50 +0000 (+0200)
Subject: vl: relocate path to configuration file
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=580e6ad6a4ebc1a039c86b7b7f0f2dcff0019091;p=qemu.git

vl: relocate path to configuration file

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 12e8ca22bd..22bc570df4 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2676,8 +2676,9 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp)
 static int qemu_read_default_config_file(void)
 {
     int ret;
+    g_autofree char *file = get_relocated_path(CONFIG_QEMU_CONFDIR "/qemu.conf");
 
-    ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf");
+    ret = qemu_read_config_file(file);
     if (ret < 0 && ret != -ENOENT) {
         return ret;
     }