Re: [Qemu-devel] [PATCH v2 2/2] add parsing of "strict" boot parameter

[Markus Armbruster]

Amos Kong <address@hidden> writes:

> Commit 6ef4716cecdfa1b3794c1a33edba9840e1aa6b5f cleaned up the
> parse code of boot parameter, parse code of "strict" wasn't
> re-implemented, it caused that strict boot feature is always
> disabled.
>
> Signed-off-by: Amos Kong <address@hidden>
> ---
>  vl.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 12fe1f7..ae6d0c6 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4074,6 +4074,7 @@ int main(int argc, char **argv, char **envp)
>          }
>  
>          boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu);
> +        boot_strict = qemu_opt_get_bool(opts, "strict", false);
>      }
>  
>      if (!kernel_cmdline) {

This restores the second half of what got dropped accidentally in commit
6ef4716.  Suggest to squash the two halves together, and rephrase the
commit message to more clearly mark it as bug fix.  Something like this:

    Fix -boot strict regressed in commit 6ef4716

    Commit 6ef4716 cleaned up parsing of -boot option argument, but
    accidentally dropped parameter strict.  It should have been updated
    exactly like parameter menu.  Do that.

I apologize for the screwup.  It took me 120 days to get my patch in,
and I botched the final rebase's conflict resolution.