[Qemu-devel] Re: [Qemu-commits] [COMMIT 52249f0] Disable kqemu by default at run time

[Rick Vernam]

On Friday 10 July 2009 3:59:14 pm Anthony Liguori wrote:
> Rick Vernam wrote:
> > On Friday 10 July 2009 2:16:43 pm Anthony Liguori wrote:
> >> From: Anthony Liguori <address@hidden>
> >>
> >>  -no-kqemu -> -enable-kqemu
> >
> > I didn't take the two or three minutes to track down where kqemu_allowed
> > is used, but from this patch I would surmise that -kernel-kqemu implies
> > -enable- kqemu?
>
> Yup.
>
> > I think that's fine if that is the case, but should it also be specified
> > in the documentation?
>
> Please send a patch.  I was very much on the fence about whether to
> change the docs so I'm not sure how I would reword it.
I gave this very little thought, but given KQemu's audience based on your 
recent poll, I don't think KQemu documentation merits much thought.

Signed-off-by: Rick Vernam <address@hidden>

diff --git a/qemu-options.hx b/qemu-options.hx
index 3f69965..86dcd17 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1387,22 +1387,24 @@ 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")
+DEF("enable-kqemu", 0, QEMU_OPTION_enable_kqemu, \
+    "-enable-kqemu   enable KQEMU user mode virtualization only\n")
 #endif
 STEXI
address@hidden -kernel-kqemu
-Enable KQEMU full virtualization (default is user mode only).
address@hidden -enable-kqemu
+Enable KQEMU user mode virtualization only. KQEMU usage is disabled by 
default.
+KQEMU options are only available if KQEMU support is enabled when compiling.
 ETEXI

 #ifdef CONFIG_KQEMU
-DEF("enable-kqemu", 0, QEMU_OPTION_enable_kqemu, \
-    "-enable-kqemu   enable KQEMU kernel module usage\n")
+DEF("kernel-kqemu", 0, QEMU_OPTION_kernel_kqemu, \
+    "-kernel-kqemu   enable KQEMU full virtualization (implies -enable-
kqemu)\n")
 #endif
 STEXI
address@hidden -enable-kqemu
-Enable KQEMU kernel module usage. KQEMU options are only available if
-KQEMU support is enabled when compiling.
address@hidden -kernel-kqemu
+Enable KQEMU full virtualization. This includes user mode (ie, -enable-
kqemu).
+KQEMU usage is disabled by default.
+KQEMU options are only available if KQEMU support is enabled when compiling.
 ETEXI

 #ifdef CONFIG_KVM


>
> Regards,
>
> Anthony Liguori