OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea1edcd
)
vl: relocate path to configuration file
author
Paolo Bonzini
<pbonzini@redhat.com>
Tue, 18 Aug 2020 09:59:50 +0000
(11:59 +0200)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Wed, 30 Sep 2020 17:11:36 +0000
(19:11 +0200)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
softmmu/vl.c
patch
|
blob
|
history
diff --git
a/softmmu/vl.c
b/softmmu/vl.c
index
12e8ca2
..
22bc570
100644
(file)
--- 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;
}