[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 1/9] util/qemu-config: fix missing machine command
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL v2 1/9] util/qemu-config: fix missing machine command line options |
Date: |
Wed, 21 Oct 2015 12:30:01 +0200 |
From: Tony Krowiak <address@hidden>
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 <address@hidden>
CC: address@hidden
Signed-off-by: Tony Krowiak <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
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
- [Qemu-devel] [PULL v2 0/9] Next set of s390x patches, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 5/9] s390x: unify device reset during subsystem_reset(), Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 7/9] s390x: machine reset function with new ipl cpu handling, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 3/9] s390x/kvm: Fix vector validity bit in device machine checks, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 2/9] s390x/virtio-ccw: fix 2.4 virtio compat, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 8/9] s390x: reset crypto only on clear reset and QEMU reset, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 4/9] s390x: flagify mcic values, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 1/9] util/qemu-config: fix missing machine command line options,
Cornelia Huck <=
- [Qemu-devel] [PULL v2 6/9] s390x/ipl: we always have an ipl device, Cornelia Huck, 2015/10/21
- [Qemu-devel] [PULL v2 9/9] s390x/cmma: clean up cmma reset, Cornelia Huck, 2015/10/21
- Re: [Qemu-devel] [PULL v2 0/9] Next set of s390x patches, Peter Maydell, 2015/10/21