Disable kqemu by default at run time

 -no-kqemu -> -enable-kqemu

kqemu is still present at compile time by default

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/kqemu.c b/kqemu.c
index c27c6ae3050284dfb6ed3e6f79bceda4b385fab8..ef0abb53dbc8d7a582033fd1bd8a52e35919240e 100644 (file)
--- a/kqemu.c
+++ b/kqemu.c
@@ -81,7 +81,7 @@ int kqemu_fd = KQEMU_INVALID_FD;
    1 = user kqemu
    2 = kernel kqemu
 */
-int kqemu_allowed = 1;
+int kqemu_allowed = 0;
 uint64_t *pages_to_flush;
 unsigned int nb_pages_to_flush;
 uint64_t *ram_pages_to_update;

diff --git a/qemu-options.hx b/qemu-options.hx
index d1d18322d9bd41e0615d24e89848b9faa61f0a61..3f6996592df174b5876c793bf54523fe605bd7d6 100644 (file)
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1396,12 +1396,12 @@ Enable KQEMU full virtualization (default is user mode only).
 ETEXI
 
 #ifdef CONFIG_KQEMU
-DEF("no-kqemu", 0, QEMU_OPTION_no_kqemu, \
-    "-no-kqemu       disable KQEMU kernel module usage\n")
+DEF("enable-kqemu", 0, QEMU_OPTION_enable_kqemu, \
+    "-enable-kqemu   enable KQEMU kernel module usage\n")
 #endif
 STEXI
-@item -no-kqemu
-Disable KQEMU kernel module usage. KQEMU options are only available if
+@item -enable-kqemu
+Enable KQEMU kernel module usage. KQEMU options are only available if
 KQEMU support is enabled when compiling.
 ETEXI
 

diff --git a/vl.c b/vl.c
index 72c8f6ac89f796138821ea640c0787e8661b4d60..50665cf77ed36487e921e2ad4df2e1648536eca9 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -5344,8 +5344,8 @@ int main(int argc, char **argv, char **envp)
                 break;
 #endif
 #ifdef CONFIG_KQEMU
-            case QEMU_OPTION_no_kqemu:
-                kqemu_allowed = 0;
+            case QEMU_OPTION_enable_kqemu:
+                kqemu_allowed = 1;
                 break;
             case QEMU_OPTION_kernel_kqemu:
                 kqemu_allowed = 2;