2023-02-02 02:58:58

by Shaoqin Huang

Subject: [PATCH v2] selftests: KVM: Replace optarg with arg in guest_modes_cmdline

From: Shaoqin Huang <[email protected]>

The parameter arg in guest_modes_cmdline not being used now, and the
optarg should be replaced with arg in guest_modes_cmdline.

And this is the chance to change strtoul() to atoi_non_negative(), since
guest mode ID will never be negative.

Signed-off-by: Shaoqin Huang <[email protected]>

---
Changes from v1:
- Change strtoul() to atoi_non_negative(). [Vipin]

---
tools/testing/selftests/kvm/lib/guest_modes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/lib/guest_modes.c b/tools/testing/selftests/kvm/lib/guest_modes.c
index 99a575bbbc52..1df3ce4b16fd 100644
--- a/tools/testing/selftests/kvm/lib/guest_modes.c
+++ b/tools/testing/selftests/kvm/lib/guest_modes.c
@@ -127,7 +127,7 @@ void guest_modes_cmdline(const char *arg)
mode_selected = true;
}

- mode = strtoul(optarg, NULL, 10);
+ mode = atoi_non_negative("Guest mode ID", arg);
TEST_ASSERT(mode < NUM_VM_MODES, "Guest mode ID %d too big", mode);
guest_modes[mode].enabled = true;
}
--
2.39.0

2023-02-02 08:19:46

by Andrew Jones

Subject: Re: [PATCH v2] selftests: KVM: Replace optarg with arg in guest_modes_cmdline

On Thu, Feb 02, 2023 at 10:57:15AM +0800, [email protected] wrote:
> From: Shaoqin Huang <[email protected]>
>
> The parameter arg in guest_modes_cmdline not being used now, and the
> optarg should be replaced with arg in guest_modes_cmdline.
>
> And this is the chance to change strtoul() to atoi_non_negative(), since
> guest mode ID will never be negative.

Fixes: e42ac777d661 ("KVM: selftests: Factor out guest mode code")

>
> Signed-off-by: Shaoqin Huang <[email protected]>
>
> ---
> Changes from v1:
> - Change strtoul() to atoi_non_negative(). [Vipin]
>
> ---
> tools/testing/selftests/kvm/lib/guest_modes.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/kvm/lib/guest_modes.c b/tools/testing/selftests/kvm/lib/guest_modes.c
> index 99a575bbbc52..1df3ce4b16fd 100644
> --- a/tools/testing/selftests/kvm/lib/guest_modes.c
> +++ b/tools/testing/selftests/kvm/lib/guest_modes.c
> @@ -127,7 +127,7 @@ void guest_modes_cmdline(const char *arg)
> mode_selected = true;
> }
>
> - mode = strtoul(optarg, NULL, 10);
> + mode = atoi_non_negative("Guest mode ID", arg);
> TEST_ASSERT(mode < NUM_VM_MODES, "Guest mode ID %d too big", mode);
> guest_modes[mode].enabled = true;
> }
> --
> 2.39.0
>

Reviewed-by: Andrew Jones <[email protected]>

2023-02-02 18:06:41

by Vipin Sharma

Subject: Re: [PATCH v2] selftests: KVM: Replace optarg with arg in guest_modes_cmdline

On Thu, Feb 2, 2023 at 12:11 AM Andrew Jones <[email protected]> wrote:
>
> On Thu, Feb 02, 2023 at 10:57:15AM +0800, [email protected] wrote:
> > From: Shaoqin Huang <[email protected]>
> >
> > The parameter arg in guest_modes_cmdline not being used now, and the
> > optarg should be replaced with arg in guest_modes_cmdline.
> >
> > And this is the chance to change strtoul() to atoi_non_negative(), since
> > guest mode ID will never be negative.
>
> Fixes: e42ac777d661 ("KVM: selftests: Factor out guest mode code")
>
> >
> > Signed-off-by: Shaoqin Huang <[email protected]>
> >
> > ---
> > Changes from v1:
> > - Change strtoul() to atoi_non_negative(). [Vipin]
> >
> > ---
> > tools/testing/selftests/kvm/lib/guest_modes.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/testing/selftests/kvm/lib/guest_modes.c b/tools/testing/selftests/kvm/lib/guest_modes.c
> > index 99a575bbbc52..1df3ce4b16fd 100644
> > --- a/tools/testing/selftests/kvm/lib/guest_modes.c
> > +++ b/tools/testing/selftests/kvm/lib/guest_modes.c
> > @@ -127,7 +127,7 @@ void guest_modes_cmdline(const char *arg)
> > mode_selected = true;
> > }
> >
> > - mode = strtoul(optarg, NULL, 10);
> > + mode = atoi_non_negative("Guest mode ID", arg);
> > TEST_ASSERT(mode < NUM_VM_MODES, "Guest mode ID %d too big", mode);
> > guest_modes[mode].enabled = true;
> > }
> > --
> > 2.39.0
> >
>
> Reviewed-by: Andrew Jones <[email protected]>
Reviewed-by: Vipin Sharma <[email protected]>

2023-02-08 02:10:23

by Sean Christopherson

Subject: Re: [PATCH v2] selftests: KVM: Replace optarg with arg in guest_modes_cmdline

On Thu, 02 Feb 2023 10:57:15 +0800, [email protected] wrote:
> The parameter arg in guest_modes_cmdline not being used now, and the
> optarg should be replaced with arg in guest_modes_cmdline.
>
> And this is the chance to change strtoul() to atoi_non_negative(), since
> guest mode ID will never be negative.
>
>
> [...]

Applied to kvm-x86 selftests, thanks!

[1/1] selftests: KVM: Replace optarg with arg in guest_modes_cmdline
https://github.com/kvm-x86/linux/commit/62f86202d76d

--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes

2023-02-08 14:46:04

by Sean Christopherson

Subject: Re: [PATCH v2] selftests: KVM: Replace optarg with arg in guest_modes_cmdline

On Wed, Feb 08, 2023, Sean Christopherson wrote:
> On Thu, 02 Feb 2023 10:57:15 +0800, [email protected] wrote:
> > The parameter arg in guest_modes_cmdline not being used now, and the
> > optarg should be replaced with arg in guest_modes_cmdline.
> >
> > And this is the chance to change strtoul() to atoi_non_negative(), since
> > guest mode ID will never be negative.
> >
> >
> > [...]
>
> Applied to kvm-x86 selftests, thanks!
>
> [1/1] selftests: KVM: Replace optarg with arg in guest_modes_cmdline
> https://github.com/kvm-x86/linux/commit/62f86202d76d

I force pushed to selftests because of a goof on my end, new SHA-1 is:

https://github.com/kvm-x86/linux/commit/7ae69d7087a9