From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zly7Q-0002sv-H2 for qemu-devel@nongnu.org; Tue, 13 Oct 2015 07:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zly7M-0005Zp-DH for qemu-devel@nongnu.org; Tue, 13 Oct 2015 07:51:48 -0400 Received: from e06smtp08.uk.ibm.com ([195.75.94.104]:42171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zly7M-0005Zd-3w for qemu-devel@nongnu.org; Tue, 13 Oct 2015 07:51:44 -0400 Received: from localhost by e06smtp08.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Oct 2015 12:51:41 +0100 Date: Tue, 13 Oct 2015 13:51:36 +0200 From: Cornelia Huck Message-ID: <20151013135136.5675e86b.cornelia.huck@de.ibm.com> In-Reply-To: <561BD4CC.4020101@redhat.com> References: <1444664181-28023-1-git-send-email-akrowiak@linux.vnet.ibm.com> <561BD4CC.4020101@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] util/qemu-config: fix missing machine command line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: Tony Krowiak , qemu-stable@nongnu.org, qemu-devel@nongnu.org On Mon, 12 Oct 2015 18:42:04 +0300 Marcel Apfelbaum 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 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)? > > > > > > Fixes: 0a7cf217 > > CC: Marcel Apfelbaum > > CC: qemu-stable@nongnu.org > > Signed-off-by: Tony Krowiak > > --- > > 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 */ } > > } > > >