diff options
| -rw-r--r-- | arch_init.c | 27 | ||||
| -rw-r--r-- | include/qemu/config-file.h | 4 | ||||
| -rw-r--r-- | vl.c | 18 |
3 files changed, 14 insertions, 35 deletions
diff --git a/arch_init.c b/arch_init.c index 6c4e287d57..c316ae1023 100644 --- a/arch_init.c +++ b/arch_init.c @@ -83,33 +83,6 @@ int graphic_depth = 32; const uint32_t arch_type = QEMU_ARCH; -static struct defconfig_file { - const char *filename; - /* Indicates it is an user config file (disabled by -no-user-config) */ - bool userconfig; -} default_config_files[] = { - { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, - { NULL }, /* end of list */ -}; - -int qemu_read_default_config_files(bool userconfig) -{ - int ret; - struct defconfig_file *f; - - for (f = default_config_files; f->filename; f++) { - if (!userconfig && f->userconfig) { - continue; - } - ret = qemu_read_config_file(f->filename); - if (ret < 0 && ret != -ENOENT) { - return ret; - } - } - - return 0; -} - struct soundhw { const char *name; const char *descr; diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index 8d4b2b6d94..c80d5c8a33 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -23,8 +23,4 @@ int qemu_read_config_file(const char *filename); void qemu_config_parse_qdict(QDict *options, QemuOptsList **lists, Error **errp); -/* Read default QEMU config files - */ -int qemu_read_default_config_files(bool userconfig); - #endif /* QEMU_CONFIG_FILE_H */ @@ -2950,6 +2950,18 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp) return 0; } +static int qemu_read_default_config_file(void) +{ + int ret; + + ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf"); + if (ret < 0 && ret != -ENOENT) { + return ret; + } + + return 0; +} + int main(int argc, char **argv, char **envp) { int i; @@ -3077,10 +3089,8 @@ int main(int argc, char **argv, char **envp) } } - if (defconfig) { - int ret; - ret = qemu_read_default_config_files(userconfig); - if (ret < 0) { + if (defconfig && userconfig) { + if (qemu_read_default_config_file() < 0) { exit(1); } } |