Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160914-1' into staging

[mirror_qemu.git] / util / qemu-config.c

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 6cfdd7204ad2f648a15eb46d3dc553618322994b..fb973074d304cb1aaed5fd3a9a22d71174b65934 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -1,9 +1,8 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/error.h"
 #include "qmp-commands.h"
 
 static QemuOptsList *vm_config_groups[48];
@@ -220,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 */ }
     }