Re: [Qemu-stable] [Qemu-devel] [PATCH] util/qemu-config: fix missing machine command line options

[Cornelia Huck]

On Tue, 13 Oct 2015 16:46:29 +0300
Marcel Apfelbaum <address@hidden> wrote:

> On 10/13/2015 02:51 PM, Cornelia Huck wrote:
> > On Mon, 12 Oct 2015 18:42:04 +0300
> > Marcel Apfelbaum <address@hidden> wrote:
> >
> >> On 10/12/2015 06:36 PM, Tony Krowiak wrote:
> >>> Commit 0a7cf217 ("util/qemu-config: fix regression of
> >>> qmp_query_command_line_options") aimed to restore parsing of global
> >>> machine options, but missed two: "aes-key-wrap" and
> >>> "dea-key-wrap" (which were present in the initial version of that
> >>> patch). Let's add them to the machine_opts again.
> >>
> >> Adding qemu-devel
> >>
> >> Hi,
> >>
> >> I thought I hunted them all, anyway, thanks for adding them.
> >>
> >> Reviewed-by: Marcel Apfelbaum <address@hidden>
> >
> > Thanks.
> >
> > util/qemu-config.c yields -ENOMAINTAINER; any obvious tree for this to
> > go through, or should I simply include this with the next batch of
> > s390x patches (as these are s390x options)?
> >
> 
> Just take it to your tree.
> Thanks!
> Marcel
> 
> >>
> >>
> >>>
> >>> Fixes: 0a7cf217

Fixed up that line to contain the subject as well and queued to my
s390-next tree.

> >>> CC: Marcel Apfelbaum <address@hidden>
> >>> CC: address@hidden
> >>> Signed-off-by: Tony Krowiak <address@hidden>
> >>> ---
> >>>    util/qemu-config.c |    8 ++++++++
> >>>    1 files changed, 8 insertions(+), 0 deletions(-)
> >>>
> >>> diff --git a/util/qemu-config.c b/util/qemu-config.c
> >>> index 5fcfd0e..687fd34 100644
> >>> --- a/util/qemu-config.c
> >>> +++ b/util/qemu-config.c
> >>> @@ -219,6 +219,14 @@ static QemuOptsList machine_opts = {
> >>>                .name = "suppress-vmdesc",
> >>>                .type = QEMU_OPT_BOOL,
> >>>                .help = "Set on to disable self-describing migration",
> >>> +        },{
> >>> +            .name = "aes-key-wrap",
> >>> +            .type = QEMU_OPT_BOOL,
> >>> +            .help = "enable/disable AES key wrapping using the CPACF 
> >>> wrapping key",
> >>> +        },{
> >>> +            .name = "dea-key-wrap",
> >>> +            .type = QEMU_OPT_BOOL,
> >>> +            .help = "enable/disable DEA key wrapping using the CPACF 
> >>> wrapping key",
> >>>            },
> >>>            { /* End of list */ }
> >>>        }
> >>>
> >>
> >
>