From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoxbW-000692-CI for qemu-devel@nongnu.org; Wed, 21 Oct 2015 13:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoxbR-0006kK-Ae for qemu-devel@nongnu.org; Wed, 21 Oct 2015 13:55:14 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:53996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoxbQ-0006k8-Vq for qemu-devel@nongnu.org; Wed, 21 Oct 2015 13:55:09 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Oct 2015 11:55:08 -0600 From: Michael Roth Date: Wed, 21 Oct 2015 12:52:08 -0500 Message-Id: <1445449930-23525-39-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1445449930-23525-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1445449930-23525-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 38/40] util/qemu-config: fix missing machine command line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Cornelia Huck , Tony Krowiak , qemu-stable@nongnu.org, Michael Roth 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 (cherry picked from commit 5bcfa0c543b42a560673cafd3b5225900ef617e1) Signed-off-by: Michael Roth --- 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 */ } } -- 1.9.1