From: Tony Krowiak Date: Mon, 12 Oct 2015 15:36:21 +0000 (-0400) Subject: util/qemu-config: fix missing machine command line options X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~121^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bcfa0c543b42a560673cafd3b5225900ef617e1;p=sdk%2Femulator%2Fqemu.git util/qemu-config: fix missing machine command line options 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 --- 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 */ } }