Commit aec0d0e1 authored by Michal Privoznik's avatar Michal Privoznik Committed by Michael Tokarev
Browse files

qemu-options: Allow -no-user-config again 



After 1217d6ca 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: default avatarMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 54be4c42

vl.c

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