From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zow9N-0007UN-FM for qemu-devel@nongnu.org; Wed, 21 Oct 2015 12:22:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zow9I-0002ar-GJ for qemu-devel@nongnu.org; Wed, 21 Oct 2015 12:22:05 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:56328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zow9I-0002aR-6P for qemu-devel@nongnu.org; Wed, 21 Oct 2015 12:22:00 -0400 Received: from localhost by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Oct 2015 10:21:59 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1444664040-27572-1-git-send-email-akrowiak@linux.vnet.ibm.com> References: <1444664040-27572-1-git-send-email-akrowiak@linux.vnet.ibm.com> Message-ID: <20151021162149.10709.34207@loki> Date: Wed, 21 Oct 2015 11:21:49 -0500 Subject: Re: [Qemu-devel] [Qemu-stable] [PATCH] util/qemu-config: fix missing machine command line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tony Krowiak , qemu-devel@nongnu.org Cc: Marcel Apfelbaum , qemu-stable@nongnu.org Quoting Tony Krowiak (2015-10-12 10:34:00) > 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. > = > Fixes: 0a7cf217 > CC: Marcel Apfelbaum > CC: qemu-stable@nongnu.org Nevermind the noise, just saw that this had already been resent and Cornelia has a PULL for it already. > 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 =3D { > .name =3D "suppress-vmdesc", > .type =3D QEMU_OPT_BOOL, > .help =3D "Set on to disable self-describing migration", > + },{ > + .name =3D "aes-key-wrap", > + .type =3D QEMU_OPT_BOOL, > + .help =3D "enable/disable AES key wrapping using the CPACF w= rapping key", > + },{ > + .name =3D "dea-key-wrap", > + .type =3D QEMU_OPT_BOOL, > + .help =3D "enable/disable DEA key wrapping using the CPACF w= rapping key", > }, > { /* End of list */ } > } > -- = > 1.7.1 > = >=20