diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2012-05-02 13:07:25 -0300 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-10 12:37:55 -0500 |
commit | b5a8fe5e8a9d8a5751dd5506026bc30a14010443 (patch) | |
tree | 58a529a9bd281966d973945ebffa4d91d3ea0679 /arch_init.c | |
parent | 04120e3bb0323c3c81c252301485ad81dd842718 (diff) |
move code to read default config files to a separate function (v2)
Function added to arch_init.c because it depends on arch-specific
settings.
Changes v1 -> v2:
- Move qemu_read_default_config_file() prototype to qemu-config.h
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'arch_init.c')
-rw-r--r-- | arch_init.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch_init.c b/arch_init.c index 9a35aeea30..4008115e35 100644 --- a/arch_init.c +++ b/arch_init.c @@ -112,6 +112,24 @@ const uint32_t arch_type = QEMU_ARCH; #define ALL_EQ(v1, v2) ((v1) == (v2)) #endif + +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; + } + + ret = qemu_read_config_file(arch_config_name); + if (ret < 0 && ret != -ENOENT) { + return ret; + } + + return 0; +} + static int is_dup_page(uint8_t *page) { VECTYPE *p = (VECTYPE *)page; |