[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/9] vl: Eliminate defconfig variable
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 5/9] vl: Eliminate defconfig variable |
Date: |
Thu, 5 Oct 2017 17:36:34 -0300 |
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 <address@hidden>
Acked-by: Alistair Francis <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
vl.c | 5 +----
1 file changed, 1 insertion(+), 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);
}
--
2.13.6
- [Qemu-devel] [PULL 0/9] x86 and machine queue, 2017-10-05, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 1/9] hw/acpi-build: Make assignment statement of next_base easy to read, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 2/9] ACPI/unit-test: Add a new testcase for RAM allocation in numa node, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 3/9] qom/cpu: move cpu_model null check to cpu_class_by_name(), Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 4/9] machine: Add a valid_cpu_types property, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 5/9] vl: Eliminate defconfig variable,
Eduardo Habkost <=
- [Qemu-devel] [PULL 6/9] qemu-options: Deprecate -nodefconfig, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 7/9] config: qemu_config_parse() return number of config groups, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 8/9] qom: update doc comment for type_register[_static](), Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 9/9] x86: Correct translation of some rdgsbase and wrgsbase encodings, Eduardo Habkost, 2017/10/05
- Re: [Qemu-devel] [PULL 0/9] x86 and machine queue, 2017-10-05, Peter Maydell, 2017/10/06