[Qemu-devel] Re: [PATCH] Disable kqemu by default

[Jan Kiszka]

Glauber Costa wrote:
> turns -no-kqemu option into -kqemu
> set kqemu_allowed to 0 by default.
> 
> Signed-off-by: Glauber Costa <address@hidden>
> ---
>  kqemu.c         |    2 +-
>  qemu-options.hx |    8 ++++----
>  vl.c            |    4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/kqemu.c b/kqemu.c
> index 1718498..203241e 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 87af798..755dc13 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1329,12 +1329,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("-kqemu", 0, QEMU_OPTION_kqemu, \
> +    "-kqemu          enable KQEMU kernel module usage\n")

To be a bit consistent with -enable-kvm, what about -enable-kqemu?

>  #endif
>  STEXI
> address@hidden -no-kqemu
> -Disable KQEMU kernel module usage. KQEMU options are only available if
> address@hidden -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 1a227bb..13d87de 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -5398,8 +5398,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_kqemu:
> +                kqemu_allowed = 1;
>                  break;
>              case QEMU_OPTION_kernel_kqemu:
>                  kqemu_allowed = 2;

Jan

signature.asc
Description: OpenPGP digital signature