From 726401be06c95cd66c91a60c702a524fdd1b6e9d Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 17 Jan 2017 16:00:51 -0200 Subject: arch_init: Remove unnecessary default_config_files table The existing default_config_files table in arch_init.c has a single entry, making it completely unnecessary. The whole code can be replaced by a single qemu_read_config_file() call in vl.c. Signed-off-by: Eduardo Habkost Message-Id: <20170117180051.11958-1-ehabkost@redhat.com> Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost --- arch_init.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'arch_init.c') diff --git a/arch_init.c b/arch_init.c index 6c4e287..c316ae1 100644 --- a/arch_init.c +++ b/arch_init.c @@ -83,33 +83,6 @@ int graphic_depth = 32; 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", true }, - { NULL }, /* end of list */ -}; - -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; - } - } - - return 0; -} - struct soundhw { const char *name; const char *descr; -- cgit v1.1