diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-21 15:07:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-21 15:07:42 +0100 |
| commit | 8bfaa25fce2c22060a17501980943538801056de (patch) | |
| tree | bc98ce8c11d3d30cad8b2937bb1ec61cf64fb2a8 /util | |
| parent | 426c0df9e3e6e64c7ea489092c57088ca4d227d0 (diff) | |
| parent | 1cd4e0f6f0a6b1978a5868b41d4faae2071dc4ee (diff) | |
| download | qemu-8bfaa25fce2c22060a17501980943538801056de.zip qemu-8bfaa25fce2c22060a17501980943538801056de.tar.gz qemu-8bfaa25fce2c22060a17501980943538801056de.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151021-v2' into staging
More s390x patches. The first ones are fixes: A regression, missed
compat and a missed part of the SIMD support. The others contain
optimizations and cleanup.
# gpg: Signature made Wed 21 Oct 2015 11:24:48 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
* remotes/cohuck/tags/s390x-20151021-v2:
s390x/cmma: clean up cmma reset
s390x: reset crypto only on clear reset and QEMU reset
s390x: machine reset function with new ipl cpu handling
s390x/ipl: we always have an ipl device
s390x: unify device reset during subsystem_reset()
s390x: flagify mcic values
s390x/kvm: Fix vector validity bit in device machine checks
s390x/virtio-ccw: fix 2.4 virtio compat
util/qemu-config: fix missing machine command line options
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | 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 = { .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 */ } } |