| Message ID | 20240307081951.1954830-1-colin.i.king@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [next] KVM: selftests: Fix spelling mistake "trigged" -> "triggered" | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-for-next-PR | fail | merge-conflict |
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 >
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
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 >
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); }
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(-)