david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move list of default config files to an array

Browse Source 
More files will be added to the list, with additional attributes, later.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Eduardo Habkost 2012-05-02 13:07:27 -03:00 committed by Anthony Liguori
parent c8262a4767
commit 756557de64
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch_init.c
View File

@ -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;
struct defconfig_file *f;
for (f = default_config_files; f->filename; f++) {
ret = qemu_read_config_file(f->filename);
if (ret < 0 && ret != -ENOENT) {
return ret;
}
}
ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf");
if (ret < 0 && ret != -ENOENT) {
return ret;
}
ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf");
if (ret < 0 && ret != -ENOENT) {
return ret;
}
return 0;
}