From f29a56147b66845914d0a645bf9b4c5bb9a6af57 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 2 May 2012 13:07:29 -0300 Subject: implement -no-user-config command-line option (v3) Changes v2 -> v3: - Rebase against latest qemu.git Changes v1 -> v2: - Change 'userconfig' field/variables to bool instead of int - Coding style change Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori --- arch_init.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'arch_init.c') diff --git a/arch_init.c b/arch_init.c index 62332e9..996baba 100644 --- a/arch_init.c +++ b/arch_init.c @@ -114,19 +114,24 @@ const uint32_t arch_type = QEMU_ARCH; static struct defconfig_file { const char *filename; + /* Indicates it is an user config file (disabled by -no-user-config) */ + bool userconfig; } default_config_files[] = { - { CONFIG_QEMU_CONFDIR "/qemu.conf" }, - { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf" }, + { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, + { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true }, { NULL }, /* end of list */ }; -int qemu_read_default_config_files(void) +int qemu_read_default_config_files(bool userconfig) { int ret; struct defconfig_file *f; for (f = default_config_files; f->filename; f++) { + if (!userconfig && f->userconfig) { + continue; + } ret = qemu_read_config_file(f->filename); if (ret < 0 && ret != -ENOENT) { return ret; -- cgit v1.1