diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-24 18:28:49 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-24 18:28:49 +0300 |
| commit | 193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded (patch) | |
| tree | 8b3ce0860a3485c07aa25dd20dc97835138728bb /qemu-options.hx | |
| parent | Merge commit '1632dc6a8f6e8662f4a203b6fb8c0371ca216946' into upstream-merge (diff) | |
| parent | Unbreak large mem support by removing kqemu (diff) | |
| download | qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.tar.gz qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.tar.bz2 qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.zip | |
Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-merge
* commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1':
Unbreak large mem support by removing kqemu
Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them.
Migration via unix sockets.
Conflicts:
Makefile.target
exec.c
osdep.c
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 02674968f..f3e915bec 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1415,25 +1415,6 @@ STEXI Set the filename for the BIOS. ETEXI -#ifdef CONFIG_KQEMU -DEF("kernel-kqemu", 0, QEMU_OPTION_kernel_kqemu, \ - "-kernel-kqemu enable KQEMU full virtualization (default is user mode only)\n") -#endif -STEXI -@item -kernel-kqemu -Enable KQEMU full virtualization (default is user mode only). -ETEXI - -#ifdef CONFIG_KQEMU -DEF("enable-kqemu", 0, QEMU_OPTION_enable_kqemu, \ - "-enable-kqemu enable KQEMU kernel module usage\n") -#endif -STEXI -@item -enable-kqemu -Enable KQEMU kernel module usage. KQEMU options are only available if -KQEMU support is enabled when compiling. -ETEXI - #ifdef CONFIG_KVM DEF("enable-kvm", 0, QEMU_OPTION_enable_kvm, \ "-enable-kvm enable KVM full virtualization support\n") |