On Wed, Sep 27, 2017 at 1:32 PM, Eduardo Habkost <ehabk...@redhat.com> wrote: > Both -nodefconfig and -no-user-config options do the same thing > today, we only need one variable to keep track of them. > > Suggested-by: Markus Armbruster <arm...@redhat.com> > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Acked-by: Alistair Francis <alistair.fran...@xilinx.com> Thanks, Alistair > --- > vl.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/vl.c b/vl.c > index 4fd01fda91..b347a97a5b 100644 > --- a/vl.c > +++ b/vl.c > @@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp) > const char *qtest_log = NULL; > const char *pid_file = NULL; > const char *incoming = NULL; > - bool defconfig = true; > bool userconfig = true; > bool nographic = false; > DisplayType display_type = DT_DEFAULT; > @@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp) > popt = lookup_opt(argc, argv, &optarg, &optind); > switch (popt->index) { > case QEMU_OPTION_nodefconfig: > - defconfig = false; > - break; > case QEMU_OPTION_nouserconfig: > userconfig = false; > break; > @@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp) > } > } > > - if (defconfig && userconfig) { > + if (userconfig) { > if (qemu_read_default_config_file() < 0) { > exit(1); > } > -- > 2.13.5 > >