diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2017-10-04 00:00:24 -0300 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-10-09 23:21:52 -0300 |
| commit | 1ea06c398cda2600974860ec7020cbbe9682e382 (patch) | |
| tree | f6c06f548ced69ad775aa8a6ae90fbf078711cb5 | |
| parent | c9cf636d48fcb1d797077e1ffa456a3d324156bc (diff) | |
| download | focaccia-qemu-1ea06c398cda2600974860ec7020cbbe9682e382.tar.gz focaccia-qemu-1ea06c398cda2600974860ec7020cbbe9682e382.zip | |
vl: Eliminate defconfig variable
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 <armbru@redhat.com> Acked-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20171004030025.7866-2-ehabkost@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | vl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vl.c b/vl.c index 3fed457921..ebea42e0ea 100644 --- a/vl.c +++ b/vl.c @@ -3111,7 +3111,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; @@ -3213,8 +3212,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; @@ -3222,7 +3219,7 @@ int main(int argc, char **argv, char **envp) } } - if (defconfig && userconfig) { + if (userconfig) { if (qemu_read_default_config_file() < 0) { exit(1); } |