riscv: kvm: define vcpu_sbi_ext_pmu in header
Subsystems (3)
PATCH 1/1 riscv: kvm: define vcpu_sbi_ext_pmu in header
Sparse is giving a warning about vcpu_sbi_ext_pmu not being defined, so add a definition to the relevant header to fix the following:
arch/riscv/kvm/vcpu_sbi_pmu.c:81:37: warning: symbol 'vcpu_sbi_ext_pmu' was not declared. Should it be static?
--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 3 +++ arch/riscv/kvm/vcpu_sbi.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/riscv/include/asm/kvm_vcpu_sbi.h +3 -0
@@ -66,4 +66,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor; +#ifdef CONFIG_RISCV_PMU_SBI +extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; +#endif #endif /* __RISCV_KVM_VCPU_SBI_H__ */
arch/riscv/kvm/vcpu_sbi.c +1 -3
@@ -20,9 +20,7 @@ static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = { };#endif -#ifdef CONFIG_RISCV_PMU_SBI -extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; -#else +#ifndef CONFIG_RISCV_PMU_SBI static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu = { .extid_start =-1UL , .extid_end = -1UL,
Signature · 1 line
2.39.2
Quoted 9 lines · On Fri, Jun 16, 2023 at 5:24?PM Ben Dooks <[email protected]> wrote:
Sparse is giving a warning about
vcpu_sbi_ext_pmunot being defined, so add a definition to the relevant header to fix the following:
arch/riscv/kvm/vcpu_sbi_pmu.c:81:37: warning: symbol 'vcpu_sbi_ext_pmu' was not declared. Should it be static?Fixes 3e5e56c60a1477 ("riscv: kvm: move extern sbi_ext declarations to a header")Signed-off-by Ben Dooks <[email protected]>
Looks good to me.
Thanks,
Anup
Quoted 35 lines
--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 3 +++ arch/riscv/kvm/vcpu_sbi.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)arch/riscv/include/asm/kvm_vcpu_sbi.h +3
-0@@ -66,4 +66,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor; +#ifdef CONFIG_RISCV_PMU_SBI +extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; +#endif #endif /* __RISCV_KVM_VCPU_SBI_H__ */ arch/riscv/kvm/vcpu_sbi.c +1
-4@@ -20,9 +20,7 @@ static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = { };#endif -#ifdef CONFIG_RISCV_PMU_SBI -extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; -#else +#ifndef CONFIG_RISCV_PMU_SBI static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu = { .extid_start =-1UL , .extid_end = -1UL, --2.39.2
Hey Ben,
Quoted 7 lines · Ben Dooks
Sparse is giving a warning about
vcpu_sbi_ext_pmunot being defined, so add a definition to the relevant header to fix the following:
arch/riscv/kvm/vcpu_sbi_pmu.c:81:37: warning: symbol 'vcpu_sbi_ext_pmu' was not declared. Should it be static?Fixes 3e5e56c60a1477 ("riscv: kvm: move extern sbi_ext declarations to a header")
You sure this is the right fixes tag? This code didn't exist when I wrote that commit, should the fixes tag not be
instead?
Cheers,
Conor.
Quoted 36 lines
Signed-off-by Ben Dooks <[email protected]>--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 3 +++ arch/riscv/kvm/vcpu_sbi.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)arch/riscv/include/asm/kvm_vcpu_sbi.h +3
-0@@ -66,4 +66,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor; +#ifdef CONFIG_RISCV_PMU_SBI +extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; +#endif #endif /* __RISCV_KVM_VCPU_SBI_H__ */ arch/riscv/kvm/vcpu_sbi.c +1
-3@@ -20,9 +20,7 @@ static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = { };#endif -#ifdef CONFIG_RISCV_PMU_SBI -extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; -#else +#ifndef CONFIG_RISCV_PMU_SBI static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu = { .extid_start =-1UL , .extid_end = -1UL,Signature · 1 line
2.39.2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kvm-riscv/attachments/20230616/2510a167/attachment-0001.sig>
Quoted 7 lines · Conor Dooley
Hey Ben,
Quoted 4 lines · Ben Dooks
Sparse is giving a warning about
vcpu_sbi_ext_pmunot being defined, so add a definition to the relevant header to fix the following:
Quoted 8 lines
Quoted 3 lines
arch/riscv/kvm/vcpu_sbi_pmu.c:81:37: warning: symbol 'vcpu_sbi_ext_pmu' was not declared. Should it be static?Fixes 3e5e56c60a1477 ("riscv: kvm: move extern sbi_ext declarations to a header")You sure this is the right fixes tag? This code didn't exist when I wrote that commit, should the fixes tag not be
Fixes cbddc4c4cb9e ("RISC-V: KVM: Add SBI PMU extension support")instead?
I think you're right there.
Quoted 39 lines
Cheers,
Conor.Quoted 36 lines
Signed-off-by Ben Dooks <[email protected]>--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 3 +++ arch/riscv/kvm/vcpu_sbi.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)arch/riscv/include/asm/kvm_vcpu_sbi.h +3
-0@@ -66,4 +66,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor; +#ifdef CONFIG_RISCV_PMU_SBI +extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; +#endif #endif /* __RISCV_KVM_VCPU_SBI_H__ */ arch/riscv/kvm/vcpu_sbi.c +1
-3@@ -20,9 +20,7 @@ static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = { };#endif -#ifdef CONFIG_RISCV_PMU_SBI -extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu; -#else +#ifndef CONFIG_RISCV_PMU_SBI static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_pmu = { .extid_start =-1UL , .extid_end = -1UL,Signature · 1 line
2.39.2
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html