[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/13] arch_init: Remove unnecessary default_config_f
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 05/13] arch_init: Remove unnecessary default_config_files table |
Date: |
Mon, 23 Jan 2017 21:27:30 -0200 |
The existing default_config_files table in arch_init.c has a
single entry, making it completely unnecessary. The whole code
can be replaced by a single qemu_read_config_file() call in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/qemu/config-file.h | 4 ----
arch_init.c | 27 ---------------------------
vl.c | 18 ++++++++++++++----
3 files changed, 14 insertions(+), 35 deletions(-)
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 */
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/vl.c b/vl.c
index ed1cbe9c73..abb0900fe4 100644
--- a/vl.c
+++ b/vl.c
@@ -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);
}
}
--
2.11.0.259.g40922b1
- [Qemu-devel] [PULL 00/13] x86, machine, numa queue (2017-01-23), Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 01/13] x86: add AVX512_VPOPCNTDQ features, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 02/13] i386: Remove AMD feature flag aliases from Opteron models, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 03/13] i386: Return migration-safe field on query-cpu-definitions, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 05/13] arch_init: Remove unnecessary default_config_files table,
Eduardo Habkost <=
- [Qemu-devel] [PULL 04/13] vl: Ensure the numa_post_machine_init func in the appropriate location, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 06/13] pc: cleanup: move smbios_set_cpuid() into pc_build_smbios(), Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 07/13] pc: don't return cpu pointer from pc_new_cpu() as it's not needed anymore, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 09/13] MAINTAINERS: Add an entry for hw/core/null-machine.c, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 08/13] machine: Make possible_cpu_arch_ids() return const pointer, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 10/13] qemu-options: Rename variables on the -numa "cpus" option, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 11/13] hw/core/null-machine: Add the possibility to instantiate a CPU and RAM, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 12/13] kvm: Simplify invtsc check, Eduardo Habkost, 2017/01/23
- [Qemu-devel] [PULL 13/13] kvm: Allow invtsc migration if tsc-khz is set explicitly, Eduardo Habkost, 2017/01/23
- Re: [Qemu-devel] [PULL 00/13] x86, machine, numa queue (2017-01-23), Peter Maydell, 2017/01/24