aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-07-09 17:28:08 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-09 17:28:08 -0500
commit52249f0f3c9f101a71ed24e207731525b8431c0a (patch)
tree25146137c4c3b4e43d662796e48e90fce7360142
parenteeb34af986c28b8da4001d947d66e2efaaad0e66 (diff)
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>
-rw-r--r--kqemu.c2
-rw-r--r--qemu-options.hx8
-rw-r--r--vl.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/kqemu.c b/kqemu.c
index c27c6ae305..ef0abb53db 100644
--- 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 d1d18322d9..3f6996592d 100644
--- 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 72c8f6ac89..50665cf77e 100644
--- 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;