Commit 726401be authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170117180051.11958-1-ehabkost@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 9c6703fe

arch_init.c

+0 −27
Original line number Diff line number Diff line
@@ -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;

include/qemu/config-file.h

+0 −4
Original line number Diff line number Diff line
@@ -23,8 +23,4 @@ int qemu_read_config_file(const char *filename); 
void qemu_config_parse_qdict(QDict *options, QemuOptsList **lists,

                             Error **errp);



/* Read default QEMU config files

 */

int qemu_read_default_config_files(bool userconfig);



#endif /* QEMU_CONFIG_FILE_H */

vl.c

+14 −4
Original line number Diff line number Diff line
@@ -2950,6 +2950,18 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp) 
    return 0;

}



static int qemu_read_default_config_file(void)

{

    int ret;



    ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf");

    if (ret < 0 && ret != -ENOENT) {

        return ret;

    }



    return 0;

}



int main(int argc, char **argv, char **envp)

{

    int i;
@@ -3077,10 +3089,8 @@ int main(int argc, char **argv, char **envp) 
        }

    }



    if (defconfig) {

        int ret;

        ret = qemu_read_default_config_files(userconfig);

        if (ret < 0) {

    if (defconfig && userconfig) {

        if (qemu_read_default_config_file() < 0) {

            exit(1);

        }

    }