[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 16/22] qemu-options: Allow -no-user-config again
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 16/22] qemu-options: Allow -no-user-config again |
Date: |
Sun, 20 May 2018 09:15:02 +0300 |
From: Michal Privoznik <address@hidden>
After 1217d6ca2bf28c0febe1bd7d5b3fa912bbf6af2a we error out
explicitly if an unknown -option was passed on the command line.
However, we are doing two pass command line option parsing. In
the first pass we just look for -no-user-config or -nodefconfig
being present which determines whether we load user config or
not. Then in the second pass we finally parse everything else
throwing an error if an unsupported -option was found. Problem is
that in the second pass -no-user-config and -nodefconfig are not
handled explicitly which makes us throw the unsupported option
error.
Signed-off-by: Michal Privoznik <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
vl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/vl.c b/vl.c
index 3b39bbd7a8..d5836c65ae 100644
--- a/vl.c
+++ b/vl.c
@@ -4011,6 +4011,10 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
break;
+ case QEMU_OPTION_nodefconfig:
+ case QEMU_OPTION_nouserconfig:
+ /* Nothing to be parsed here. Especially, do not error out
below. */
+ break;
default:
if (os_parse_cmd_args(popt->index, optarg)) {
error_report("Option not supported in this build");
--
2.11.0
- [Qemu-trivial] [PULL 20/22] gdbstub: Handle errors in gdb_accept(), (continued)
- [Qemu-trivial] [PULL 20/22] gdbstub: Handle errors in gdb_accept(), Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 08/22] qemu-img: remove references to GEN_DOCS, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 07/22] qemu-img.texi: fix command ordering, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 22/22] acpi: fix a comment about aml_call0(), Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 10/22] qemu-img-cmds.hx: add passive-aggressive note, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 21/22] qapi/net.json: Fix the version number of the "vlan" removal, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 05/22] HACKING: document preference for g_new instead of g_malloc, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 09/22] qemu-img: Make documentation between .texi and .hx consistent, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 16/22] qemu-options: Allow -no-user-config again,
Michael Tokarev <=
- [Qemu-trivial] [PULL 11/22] hw/ide/ahci: Keep ALLWINNER_AHCI() macro internal, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 12/22] tests: fix tpm-crb tpm-tis tests race, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 19/22] gdbstub: Use qemu_set_cloexec(), Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 18/22] replace functions which are only available in glib-2.24, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 14/22] Remove unnecessary variables for function return value, Michael Tokarev, 2018/05/20
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2018-05-20, Peter Maydell, 2018/05/21