From 756557de6492b04a3bc6670366b925f28698f903 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 2 May 2012 13:07:27 -0300 Subject: move list of default config files to an array More files will be added to the list, with additional attributes, later. Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori --- arch_init.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/arch_init.c b/arch_init.c index 152cbbbb63..62332e9ff0 100644 --- a/arch_init.c +++ b/arch_init.c @@ -112,20 +112,27 @@ const uint32_t arch_type = QEMU_ARCH; #endif +static struct defconfig_file { + const char *filename; +} default_config_files[] = { + { CONFIG_QEMU_CONFDIR "/qemu.conf" }, + { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf" }, + { NULL }, /* end of list */ +}; + + int qemu_read_default_config_files(void) { int ret; - - ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf"); - if (ret < 0 && ret != -ENOENT) { - return ret; - } + struct defconfig_file *f; - ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf"); - if (ret < 0 && ret != -ENOENT) { - return ret; + for (f = default_config_files; f->filename; f++) { + ret = qemu_read_config_file(f->filename); + if (ret < 0 && ret != -ENOENT) { + return ret; + } } - + return 0; } -- cgit v1.2.3