gwj / at91sam9263 · Commits

Commit 52249f0f3c9f101a71ed24e207731525b8431c0a

Authored by Anthony Liguori
1 parent eeb34af9

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>
Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
... ... @@ -81,7 +81,7 @@ int kqemu_fd = KQEMU_INVALID_FD;
81 81 1 = user kqemu
82 82 2 = kernel kqemu
83 83 */
84   -int kqemu_allowed = 1;
  84 +int kqemu_allowed = 0;
85 85 uint64_t *pages_to_flush;
86 86 unsigned int nb_pages_to_flush;
87 87 uint64_t *ram_pages_to_update;
... ...
qemu-options.hx
  View file @52249f0
... ... @@ -1396,12 +1396,12 @@ Enable KQEMU full virtualization (default is user mode only).
1396 1396 ETEXI
1397 1397  
1398 1398 #ifdef CONFIG_KQEMU
1399   -DEF("no-kqemu", 0, QEMU_OPTION_no_kqemu, \
1400   - "-no-kqemu disable KQEMU kernel module usage\n")
  1399 +DEF("enable-kqemu", 0, QEMU_OPTION_enable_kqemu, \
  1400 + "-enable-kqemu enable KQEMU kernel module usage\n")
1401 1401 #endif
1402 1402 STEXI
1403   -@item -no-kqemu
1404   -Disable KQEMU kernel module usage. KQEMU options are only available if
  1403 +@item -enable-kqemu
  1404 +Enable KQEMU kernel module usage. KQEMU options are only available if
1405 1405 KQEMU support is enabled when compiling.
1406 1406 ETEXI
1407 1407  
... ...
... ... @@ -5344,8 +5344,8 @@ int main(int argc, char **argv, char **envp)
5344 5344 break;
5345 5345 #endif
5346 5346 #ifdef CONFIG_KQEMU
5347   - case QEMU_OPTION_no_kqemu:
5348   - kqemu_allowed = 0;
  5347 + case QEMU_OPTION_enable_kqemu:
  5348 + kqemu_allowed = 1;
5349 5349 break;
5350 5350 case QEMU_OPTION_kernel_kqemu:
5351 5351 kqemu_allowed = 2;
... ...