[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qemu 3/6] move list of default config files to an ar
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH qemu 3/6] move list of default config files to an array |
Date: |
Wed, 2 May 2012 13:07:27 -0300 |
More files will be added to the list, with additional attributes, later.
Signed-off-by: Eduardo Habkost <address@hidden>
---
arch_init.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 152cbbb..62332e9 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;
}
--
1.7.3.2
- [Qemu-devel] [PATCH qemu v3 0/6] -no-user-config option, move CPU models to /usr/share, Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 4/6] vl.c: change 'defconfig' variable to bool (v2), Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 3/6] move list of default config files to an array,
Eduardo Habkost <=
- [Qemu-devel] [PATCH qemu 2/6] eliminate arch_config_name variable, Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 6/6] move CPU definitions to /usr/share/qemu/cpus-x86_64.conf (v2), Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 1/6] move code to read default config files to a separate function (v2), Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line option (v3), Eduardo Habkost, 2012/05/02
- Re: [Qemu-devel] [PATCH qemu v3 0/6] -no-user-config option, move CPU models to /usr/share, Eduardo Habkost, 2012/05/11