diff options
| author |   Avi Kivity <avi@redhat.com> | 2012-08-05 12:58:02 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-08-05 12:58:02 +0300 |
| commit | 295b598aec4a775fcf2769b082e60b7d8cffd674 (patch) | |
| tree | f077574e9cef2d30696a9d4f3d711e813388946b /qemu-options.hx | |
| parent | 0f0e69d3390ae6fcb661b447916fb42cf0bc9764 (diff) | |
| parent | 0f66998ff6d5d2133b9b08471a44e13b11119e50 (diff) | |
Merge commit '0f66998ff6d5d2133b9b08471a44e13b11119e50' into upstream-merge
* commit '0f66998ff6d5d2133b9b08471a44e13b11119e50': (40 commits)
vnc: disable VNC password authentication (security type 2) when in FIPS mode
exec.c: Remove out of date comment
exec.c: Use subpages for large unaligned mappings
exec.c: Fix off-by-one error in register_subpage
socket: clean up redundant assignment
hmp: show the backing file depth
block: Use bdrv_get_backing_file_depth()
block: create bdrv_get_backing_file_depth()
qom: Clean libuser object and dependency files
usb: Clean common object and dependency files
Support 'help' as a synonym for '?' in command line options
cpu: Move thread_kicked to CPUState
cpu: Move thread field into CPUState
cpu: Move CPU_COMMON_THREAD into CPUState
qemu-thread: Let qemu_thread_is_self() return bool
qapi: qapi.py: allow the "'" character to be escaped
Replace 'struct siginfo' with 'siginfo_t'.
fix Xen compilation
configure: Fix xen probe with Xen 4.2 and later
net: add the support for -netdev socket, listen
...
Conflicts:
qemu-options.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 8bd536647..3ecff325d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -6,6 +6,10 @@ HXCOMM construct option structures, enums and help message for specified HXCOMM architectures. HXCOMM HXCOMM can be used for comments, discarded from both texi and C +HXCOMM TODO : when we are able to change -help output without breaking +HXCOMM libvirt we should update the help options which refer to -cpu ?, +HXCOMM -driver ?, etc to use the preferred -cpu help etc instead. + DEFHEADING(Standard options:) STEXI @table @option @@ -2783,6 +2787,17 @@ DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "-qtest-log LOG specify tracing options\n", QEMU_ARCH_ALL) +#ifdef __linux__ +DEF("enable-fips", 0, QEMU_OPTION_enablefips, + "-enable-fips enable FIPS 140-2 compliance\n", + QEMU_ARCH_ALL) +#endif +STEXI +@item -enable-fips +@findex -enable-fips +Enable FIPS 140-2 compliance mode. +ETEXI + DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "-no-kvm disable KVM hardware virtualization\n", QEMU_ARCH_ALL) |