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

[Rick Vernam]

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?
I think that's fine if that is the case, but should it also be specified in the 
documentation?

>
> kqemu is still present at compile time by default
>
> Signed-off-by: Anthony Liguori <address@hidden>
>
> diff --git a/kqemu.c b/kqemu.c
> index c27c6ae..ef0abb5 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 d1d1832..3f69965 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
> address@hidden -no-kqemu
> -Disable KQEMU kernel module usage. KQEMU options are only available if
> address@hidden -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 72c8f6a..50665cf 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;