[PATCH] KVM: selftests: Fix RISC-V compilation

[PATCH] KVM: selftests: Fix RISC-V compilation

[Andrew Jones]

Due to commit 2b7deea3ec7c ("Revert "kvm: selftests: move base
kvm_util.h declarations to kvm_util_base.h"") kvm selftests now
requires implicitly including ucall_common.h when needed. The commit
added the directives everywhere they were needed at the time, but, by
merge time, new places had been merged for RISC-V. Add those now to
fix RISC-V's compilation.

Fixes: dee7ea42a1eb ("Merge tag 'kvm-x86-selftests_utils-6.10' of https://github.com/kvm-x86/linux into HEAD")
Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
---
 tools/testing/selftests/kvm/lib/riscv/ucall.c    | 1 +
 tools/testing/selftests/kvm/riscv/ebreak_test.c  | 1 +
 tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/testing/selftests/kvm/lib/riscv/ucall.c b/tools/testing/selftests/kvm/lib/riscv/ucall.c
index 14ee17151a59..b5035c63d516 100644
--- a/tools/testing/selftests/kvm/lib/riscv/ucall.c
+++ b/tools/testing/selftests/kvm/lib/riscv/ucall.c
@@ -9,6 +9,7 @@
 
 #include "kvm_util.h"
 #include "processor.h"
+#include "sbi.h"
 
 void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)
 {
diff --git a/tools/testing/selftests/kvm/riscv/ebreak_test.c b/tools/testing/selftests/kvm/riscv/ebreak_test.c
index 823c132069b4..0e0712854953 100644
--- a/tools/testing/selftests/kvm/riscv/ebreak_test.c
+++ b/tools/testing/selftests/kvm/riscv/ebreak_test.c
@@ -6,6 +6,7 @@
  *
  */
 #include "kvm_util.h"
+#include "ucall_common.h"
 
 #define LABEL_ADDRESS(v) ((uint64_t)&(v))
 
diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
index 69bb94e6b227..f299cbfd23ca 100644
--- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
+++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
@@ -15,6 +15,7 @@
 #include "processor.h"
 #include "sbi.h"
 #include "arch_timer.h"
+#include "ucall_common.h"
 
 /* Maximum counters(firmware + hardware) */
 #define RISCV_MAX_PMU_COUNTERS 64
-- 
2.45.1

Re: [PATCH] KVM: selftests: Fix RISC-V compilation

[Andrew Jones]

On Mon, Jun 03, 2024 at 02:20:46PM GMT, Andrew Jones wrote:
> Due to commit 2b7deea3ec7c ("Revert "kvm: selftests: move base
> kvm_util.h declarations to kvm_util_base.h"") kvm selftests now
> requires implicitly including ucall_common.h when needed. The commit
           ^ of course I meant 'explicitly' here. Gota love brain inversions
and not reviewing commit messages closely until after posting... Should I
post a v2 or just promise to buy a beer in exchange for a fixup-on-merge?

Thanks,
drew

> added the directives everywhere they were needed at the time, but, by
> merge time, new places had been merged for RISC-V. Add those now to
> fix RISC-V's compilation.
> 
> Fixes: dee7ea42a1eb ("Merge tag 'kvm-x86-selftests_utils-6.10' of https://github.com/kvm-x86/linux into HEAD")
> Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
> ---
>  tools/testing/selftests/kvm/lib/riscv/ucall.c    | 1 +
>  tools/testing/selftests/kvm/riscv/ebreak_test.c  | 1 +
>  tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/tools/testing/selftests/kvm/lib/riscv/ucall.c b/tools/testing/selftests/kvm/lib/riscv/ucall.c
> index 14ee17151a59..b5035c63d516 100644
> --- a/tools/testing/selftests/kvm/lib/riscv/ucall.c
> +++ b/tools/testing/selftests/kvm/lib/riscv/ucall.c
> @@ -9,6 +9,7 @@
>  
>  #include "kvm_util.h"
>  #include "processor.h"
> +#include "sbi.h"
>  
>  void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)
>  {
> diff --git a/tools/testing/selftests/kvm/riscv/ebreak_test.c b/tools/testing/selftests/kvm/riscv/ebreak_test.c
> index 823c132069b4..0e0712854953 100644
> --- a/tools/testing/selftests/kvm/riscv/ebreak_test.c
> +++ b/tools/testing/selftests/kvm/riscv/ebreak_test.c
> @@ -6,6 +6,7 @@
>   *
>   */
>  #include "kvm_util.h"
> +#include "ucall_common.h"
>  
>  #define LABEL_ADDRESS(v) ((uint64_t)&(v))
>  
> diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
> index 69bb94e6b227..f299cbfd23ca 100644
> --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
> +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
> @@ -15,6 +15,7 @@
>  #include "processor.h"
>  #include "sbi.h"
>  #include "arch_timer.h"
> +#include "ucall_common.h"
>  
>  /* Maximum counters(firmware + hardware) */
>  #define RISCV_MAX_PMU_COUNTERS 64
> -- 
> 2.45.1
> 

Re: [PATCH] KVM: selftests: Fix RISC-V compilation

[Sean Christopherson]

On Tue, Jun 04, 2024, Andrew Jones wrote:
> On Mon, Jun 03, 2024 at 02:20:46PM GMT, Andrew Jones wrote:
> > Due to commit 2b7deea3ec7c ("Revert "kvm: selftests: move base
> > kvm_util.h declarations to kvm_util_base.h"") kvm selftests now
> > requires implicitly including ucall_common.h when needed. The commit
>            ^ of course I meant 'explicitly' here. Gota love brain inversions
> and not reviewing commit messages closely until after posting... Should I
> post a v2 or just promise to buy a beer in exchange for a fixup-on-merge?

LOL, what kind of question is that?  Beer must be a lot cheaper in your neck of
the woods :-)

I'll grab this if no one jumps on it by tomorrow.

Re: [PATCH] KVM: selftests: Fix RISC-V compilation

[Anup Patel]

On Mon, Jun 3, 2024 at 5:50 PM Andrew Jones <ajones@ventanamicro.com> wrote:
>
> Due to commit 2b7deea3ec7c ("Revert "kvm: selftests: move base
> kvm_util.h declarations to kvm_util_base.h"") kvm selftests now
> requires implicitly including ucall_common.h when needed. The commit
> added the directives everywhere they were needed at the time, but, by
> merge time, new places had been merged for RISC-V. Add those now to
> fix RISC-V's compilation.
>
> Fixes: dee7ea42a1eb ("Merge tag 'kvm-x86-selftests_utils-6.10' of https://github.com/kvm-x86/linux into HEAD")
> Signed-off-by: Andrew Jones <ajones@ventanamicro.com>

Queued this for Linux-6.10-rcX fixes.

Thanks,
Anup

> ---
>  tools/testing/selftests/kvm/lib/riscv/ucall.c    | 1 +
>  tools/testing/selftests/kvm/riscv/ebreak_test.c  | 1 +
>  tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 1 +
>  3 files changed, 3 insertions(+)
>
> diff --git a/tools/testing/selftests/kvm/lib/riscv/ucall.c b/tools/testing/selftests/kvm/lib/riscv/ucall.c
> index 14ee17151a59..b5035c63d516 100644
> --- a/tools/testing/selftests/kvm/lib/riscv/ucall.c
> +++ b/tools/testing/selftests/kvm/lib/riscv/ucall.c
> @@ -9,6 +9,7 @@
>
>  #include "kvm_util.h"
>  #include "processor.h"
> +#include "sbi.h"
>
>  void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)
>  {
> diff --git a/tools/testing/selftests/kvm/riscv/ebreak_test.c b/tools/testing/selftests/kvm/riscv/ebreak_test.c
> index 823c132069b4..0e0712854953 100644
> --- a/tools/testing/selftests/kvm/riscv/ebreak_test.c
> +++ b/tools/testing/selftests/kvm/riscv/ebreak_test.c
> @@ -6,6 +6,7 @@
>   *
>   */
>  #include "kvm_util.h"
> +#include "ucall_common.h"
>
>  #define LABEL_ADDRESS(v) ((uint64_t)&(v))
>
> diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
> index 69bb94e6b227..f299cbfd23ca 100644
> --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
> +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
> @@ -15,6 +15,7 @@
>  #include "processor.h"
>  #include "sbi.h"
>  #include "arch_timer.h"
> +#include "ucall_common.h"
>
>  /* Maximum counters(firmware + hardware) */
>  #define RISCV_MAX_PMU_COUNTERS 64
> --
> 2.45.1
>