Re: [PATCH 2/2] kvm tools: change option type of RNG from increment to boolean

[Pekka Enberg <penberg@kernel.org>]

On 8/17/11 12:44 PM, Liming Wang wrote:
> Becasue virtio random generator is a single device, change its option
> type to boolean.
>
> Signed-off-by: Liming Wang<walimisdev@gmail.com>

I suppose the idea here was to support multiple rng devices. Sasha?

> ---
>   tools/kvm/builtin-run.c |    7 +++----
>   1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
> index 2816774..646ba21 100644
> --- a/tools/kvm/builtin-run.c
> +++ b/tools/kvm/builtin-run.c
> @@ -60,7 +60,7 @@ __thread struct kvm_cpu *current_kvm_cpu;
>
>   static u64 ram_size;
>   static u8  image_count;
> -static int virtio_rng;
> +static bool virtio_rng;
>   static const char *kernel_cmdline;
>   static const char *kernel_filename;
>   static const char *vmlinux_filename;
> @@ -161,7 +161,7 @@ static const struct option options[] = {
>   	OPT_BOOLEAN('\0', "balloon",&balloon, "Enable virtio balloon"),
>   	OPT_BOOLEAN('\0', "vnc",&vnc, "Enable VNC framebuffer"),
>   	OPT_BOOLEAN('\0', "sdl",&sdl, "Enable SDL framebuffer"),
> -	OPT_INCR('\0', "rng",&virtio_rng, "Enable virtio Random Number Generator"),
> +	OPT_BOOLEAN('\0', "rng",&virtio_rng, "Enable virtio Random Number Generator"),
>   	OPT_CALLBACK('\0', "9p", NULL, "dir_to_share,tag_name",
>   		     "Enable virtio 9p to share files between host and guest", virtio_9p_rootdir_parser),
>   	OPT_STRING('\0', "console",&console, "serial or virtio",
> @@ -641,8 +641,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
>   		virtio_console__init(kvm);
>
>   	if (virtio_rng)
> -		while (virtio_rng--)
> -			virtio_rng__init(kvm);
> +		virtio_rng__init(kvm);
>
>   	if (balloon)
>   		virtio_bln__init(kvm);