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 /vl.c | |
parent | 04120e3bb0323c3c81c252301485ad81dd842718 (diff) | |
download | qemu-b5a8fe5e8a9d8a5751dd5506026bc30a14010443.zip qemu-b5a8fe5e8a9d8a5751dd5506026bc30a14010443.tar.gz qemu-b5a8fe5e8a9d8a5751dd5506026bc30a14010443.tar.bz2 |
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 'vl.c')
-rw-r--r-- | vl.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -2358,14 +2358,8 @@ int main(int argc, char **argv, char **envp) if (defconfig) { int ret; - - ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf"); - if (ret < 0 && ret != -ENOENT) { - exit(1); - } - - ret = qemu_read_config_file(arch_config_name); - if (ret < 0 && ret != -ENOENT) { + ret = qemu_read_default_config_files(); + if (ret < 0) { exit(1); } } |