linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered"
@ 2024-03-07  8:19 Colin Ian King
  2024-03-07 22:17 ` Oliver Upton
  2024-03-25  8:45 ` Anup Patel
  0 siblings, 2 replies; 4+ messages in thread
From: Colin Ian King @ 2024-03-07  8:19 UTC (permalink / raw)
  To: Marc Zyngier, Oliver Upton, James Morse, Suzuki K Poulose,
	Zenghui Yu, Paolo Bonzini, Shuah Khan, Anup Patel, Atish Patra,
	Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-arm-kernel,
	kvmarm, kvm, linux-kselftest, linux-kernel, kvm-riscv,
	linux-riscv
  Cc: kernel-janitors

There are spelling mistakes in __GUEST_ASSERT messages. Fix them.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +-
 tools/testing/selftests/kvm/riscv/arch_timer.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c
index ddba2c2fb5de..16ac74d07d68 100644
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@ -136,7 +136,7 @@ static void guest_run_stage(struct test_vcpu_shared_data *shared_data,
 		irq_iter = READ_ONCE(shared_data->nr_iter);
 		__GUEST_ASSERT(config_iter + 1 == irq_iter,
 				"config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
-				"  Guest timer interrupt was not trigged within the specified\n"
+				"  Guest timer interrupt was not triggered within the specified\n"
 				"  interval, try to increase the error margin by [-e] option.\n",
 				config_iter + 1, irq_iter);
 	}
diff --git a/tools/testing/selftests/kvm/riscv/arch_timer.c b/tools/testing/selftests/kvm/riscv/arch_timer.c
index e22848f747c0..0f9cabd99fd4 100644
--- a/tools/testing/selftests/kvm/riscv/arch_timer.c
+++ b/tools/testing/selftests/kvm/riscv/arch_timer.c
@@ -60,7 +60,7 @@ static void guest_run(struct test_vcpu_shared_data *shared_data)
 		irq_iter = READ_ONCE(shared_data->nr_iter);
 		__GUEST_ASSERT(config_iter + 1 == irq_iter,
 				"config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
-				"  Guest timer interrupt was not trigged within the specified\n"
+				"  Guest timer interrupt was not triggered within the specified\n"
 				"  interval, try to increase the error margin by [-e] option.\n",
 				config_iter + 1, irq_iter);
 	}
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered"
  2024-03-07  8:19 [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered" Colin Ian King
@ 2024-03-07 22:17 ` Oliver Upton
  2024-03-08  5:19   ` Anup Patel
  2024-03-25  8:45 ` Anup Patel
  1 sibling, 1 reply; 4+ messages in thread
From: Oliver Upton @ 2024-03-07 22:17 UTC (permalink / raw)
  To: Colin Ian King
  Cc: Marc Zyngier, James Morse, Suzuki K Poulose, Zenghui Yu,
	Paolo Bonzini, Shuah Khan, Anup Patel, Atish Patra,
	Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-arm-kernel,
	kvmarm, kvm, linux-kselftest, linux-kernel, kvm-riscv,
	linux-riscv, kernel-janitors

Thanks for the fix Colin. Paolo/Anup, up to you how you want to play it,
I see the 6.9 PR is already out for riscv.

Acked-by: Oliver Upton <oliver.upton@linux.dev>

On Thu, Mar 07, 2024 at 08:19:51AM +0000, Colin Ian King wrote:
> There are spelling mistakes in __GUEST_ASSERT messages. Fix them.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>  tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +-
>  tools/testing/selftests/kvm/riscv/arch_timer.c   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c
> index ddba2c2fb5de..16ac74d07d68 100644
> --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
> +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
> @@ -136,7 +136,7 @@ static void guest_run_stage(struct test_vcpu_shared_data *shared_data,
>  		irq_iter = READ_ONCE(shared_data->nr_iter);
>  		__GUEST_ASSERT(config_iter + 1 == irq_iter,
>  				"config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
> -				"  Guest timer interrupt was not trigged within the specified\n"
> +				"  Guest timer interrupt was not triggered within the specified\n"
>  				"  interval, try to increase the error margin by [-e] option.\n",
>  				config_iter + 1, irq_iter);
>  	}
> diff --git a/tools/testing/selftests/kvm/riscv/arch_timer.c b/tools/testing/selftests/kvm/riscv/arch_timer.c
> index e22848f747c0..0f9cabd99fd4 100644
> --- a/tools/testing/selftests/kvm/riscv/arch_timer.c
> +++ b/tools/testing/selftests/kvm/riscv/arch_timer.c
> @@ -60,7 +60,7 @@ static void guest_run(struct test_vcpu_shared_data *shared_data)
>  		irq_iter = READ_ONCE(shared_data->nr_iter);
>  		__GUEST_ASSERT(config_iter + 1 == irq_iter,
>  				"config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
> -				"  Guest timer interrupt was not trigged within the specified\n"
> +				"  Guest timer interrupt was not triggered within the specified\n"
>  				"  interval, try to increase the error margin by [-e] option.\n",
>  				config_iter + 1, irq_iter);
>  	}
> -- 
> 2.39.2
> 

-- 
Thanks,
Oliver

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered"
  2024-03-07 22:17 ` Oliver Upton
@ 2024-03-08  5:19   ` Anup Patel
  0 siblings, 0 replies; 4+ messages in thread
From: Anup Patel @ 2024-03-08  5:19 UTC (permalink / raw)
  To: Oliver Upton
  Cc: Colin Ian King, Marc Zyngier, James Morse, Suzuki K Poulose,
	Zenghui Yu, Paolo Bonzini, Shuah Khan, Atish Patra,
	Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-arm-kernel,
	kvmarm, kvm, linux-kselftest, linux-kernel, kvm-riscv,
	linux-riscv, kernel-janitors

On Fri, Mar 8, 2024 at 3:47 AM Oliver Upton <oliver.upton@linux.dev> wrote:
>
> Thanks for the fix Colin. Paolo/Anup, up to you how you want to play it,
> I see the 6.9 PR is already out for riscv.
>
> Acked-by: Oliver Upton <oliver.upton@linux.dev>

I can take this as a Linux-6.9-rcX fix if everyone is okay with it.

Regards,
Anup

>
> On Thu, Mar 07, 2024 at 08:19:51AM +0000, Colin Ian King wrote:
> > There are spelling mistakes in __GUEST_ASSERT messages. Fix them.
> >
> > Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> > ---
> >  tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +-
> >  tools/testing/selftests/kvm/riscv/arch_timer.c   | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c
> > index ddba2c2fb5de..16ac74d07d68 100644
> > --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
> > +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
> > @@ -136,7 +136,7 @@ static void guest_run_stage(struct test_vcpu_shared_data *shared_data,
> >               irq_iter = READ_ONCE(shared_data->nr_iter);
> >               __GUEST_ASSERT(config_iter + 1 == irq_iter,
> >                               "config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
> > -                             "  Guest timer interrupt was not trigged within the specified\n"
> > +                             "  Guest timer interrupt was not triggered within the specified\n"
> >                               "  interval, try to increase the error margin by [-e] option.\n",
> >                               config_iter + 1, irq_iter);
> >       }
> > diff --git a/tools/testing/selftests/kvm/riscv/arch_timer.c b/tools/testing/selftests/kvm/riscv/arch_timer.c
> > index e22848f747c0..0f9cabd99fd4 100644
> > --- a/tools/testing/selftests/kvm/riscv/arch_timer.c
> > +++ b/tools/testing/selftests/kvm/riscv/arch_timer.c
> > @@ -60,7 +60,7 @@ static void guest_run(struct test_vcpu_shared_data *shared_data)
> >               irq_iter = READ_ONCE(shared_data->nr_iter);
> >               __GUEST_ASSERT(config_iter + 1 == irq_iter,
> >                               "config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
> > -                             "  Guest timer interrupt was not trigged within the specified\n"
> > +                             "  Guest timer interrupt was not triggered within the specified\n"
> >                               "  interval, try to increase the error margin by [-e] option.\n",
> >                               config_iter + 1, irq_iter);
> >       }
> > --
> > 2.39.2
> >
>
> --
> Thanks,
> Oliver

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered"
  2024-03-07  8:19 [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered" Colin Ian King
  2024-03-07 22:17 ` Oliver Upton
@ 2024-03-25  8:45 ` Anup Patel
  1 sibling, 0 replies; 4+ messages in thread
From: Anup Patel @ 2024-03-25  8:45 UTC (permalink / raw)
  To: Colin Ian King
  Cc: Marc Zyngier, Oliver Upton, James Morse, Suzuki K Poulose,
	Zenghui Yu, Paolo Bonzini, Shuah Khan, Atish Patra,
	Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-arm-kernel,
	kvmarm, kvm, linux-kselftest, linux-kernel, kvm-riscv,
	linux-riscv, kernel-janitors

On Thu, Mar 7, 2024 at 1:49 PM Colin Ian King <colin.i.king@gmail.com> wrote:
>
> There are spelling mistakes in __GUEST_ASSERT messages. Fix them.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

Queued this patch for Linux-6.9 fixes.

Thanks,
Anup

> ---
>  tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +-
>  tools/testing/selftests/kvm/riscv/arch_timer.c   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c
> index ddba2c2fb5de..16ac74d07d68 100644
> --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
> +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
> @@ -136,7 +136,7 @@ static void guest_run_stage(struct test_vcpu_shared_data *shared_data,
>                 irq_iter = READ_ONCE(shared_data->nr_iter);
>                 __GUEST_ASSERT(config_iter + 1 == irq_iter,
>                                 "config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
> -                               "  Guest timer interrupt was not trigged within the specified\n"
> +                               "  Guest timer interrupt was not triggered within the specified\n"
>                                 "  interval, try to increase the error margin by [-e] option.\n",
>                                 config_iter + 1, irq_iter);
>         }
> diff --git a/tools/testing/selftests/kvm/riscv/arch_timer.c b/tools/testing/selftests/kvm/riscv/arch_timer.c
> index e22848f747c0..0f9cabd99fd4 100644
> --- a/tools/testing/selftests/kvm/riscv/arch_timer.c
> +++ b/tools/testing/selftests/kvm/riscv/arch_timer.c
> @@ -60,7 +60,7 @@ static void guest_run(struct test_vcpu_shared_data *shared_data)
>                 irq_iter = READ_ONCE(shared_data->nr_iter);
>                 __GUEST_ASSERT(config_iter + 1 == irq_iter,
>                                 "config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
> -                               "  Guest timer interrupt was not trigged within the specified\n"
> +                               "  Guest timer interrupt was not triggered within the specified\n"
>                                 "  interval, try to increase the error margin by [-e] option.\n",
>                                 config_iter + 1, irq_iter);
>         }
> --
> 2.39.2
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-03-25  8:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-07  8:19 [PATCH][next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered" Colin Ian King
2024-03-07 22:17 ` Oliver Upton
2024-03-08  5:19   ` Anup Patel
2024-03-25  8:45 ` Anup Patel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).