From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zoqf1-0001gV-6j for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:30:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zoqev-000826-Ej for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:30:23 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:46226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zoqev-00080J-5V for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:30:17 -0400 Received: from localhost by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Oct 2015 11:30:16 +0100 From: Cornelia Huck Date: Wed, 21 Oct 2015 12:30:01 +0200 Message-Id: <1445423409-22218-2-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1445423409-22218-1-git-send-email-cornelia.huck@de.ibm.com> References: <1445423409-22218-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL v2 1/9] util/qemu-config: fix missing machine command line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: Tony Krowiak , Cornelia Huck , qemu-stable@nongnu.org, qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Marcel Apfelbaum From: Tony Krowiak 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 ("util/qemu-config: fix regression of qmp_query_command_line_options") CC: Marcel Apfelbaum CC: qemu-stable@nongnu.org Signed-off-by: Tony Krowiak Reviewed-by: Marcel Apfelbaum Tested-by: Christian Borntraeger Message-Id: <1444664181-28023-1-git-send-email-akrowiak@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck --- util/qemu-config.c | 8 ++++++++ 1 file changed, 8 insertions(+) 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 */ } } -- 2.6.2