2023-02-24 19:28:40

by Sean Christopherson

Subject: [PATCH] KVM: MIPS: Make kvm_mips_callbacks const

Make kvm_mips_callbacks fully const as it's now hardcoded to point at
kvm_vz_callbacks, the only remaining the set of callbacks.

Link: https://lore.kernel.org/all/[email protected]
Suggested-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Sean Christopherson <[email protected]>
---
arch/mips/include/asm/kvm_host.h | 2 +-
arch/mips/kvm/vz.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 2803c9c21ef9..957121a495f0 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -757,7 +757,7 @@ struct kvm_mips_callbacks {
int (*vcpu_run)(struct kvm_vcpu *vcpu);
void (*vcpu_reenter)(struct kvm_vcpu *vcpu);
};
-extern struct kvm_mips_callbacks *kvm_mips_callbacks;
+extern const struct kvm_mips_callbacks * const kvm_mips_callbacks;
int kvm_mips_emulation_init(void);

/* Debug: dump vcpu state */
diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c
index dafab003ea0d..3d21cbfa7443 100644
--- a/arch/mips/kvm/vz.c
+++ b/arch/mips/kvm/vz.c
@@ -3305,7 +3305,7 @@ static struct kvm_mips_callbacks kvm_vz_callbacks = {
};

/* FIXME: Get rid of the callbacks now that trap-and-emulate is gone. */
-struct kvm_mips_callbacks *kvm_mips_callbacks = &kvm_vz_callbacks;
+const struct kvm_mips_callbacks * const kvm_mips_callbacks = &kvm_vz_callbacks;

int kvm_mips_emulation_init(void)
{

base-commit: 3ad108511e1c19ff3a3fcb9a39b3eaebf4dd4054
--
2.39.2.722.g9855ee24e9-goog

2023-02-26 22:06:18

by Philippe Mathieu-Daudé

Subject: Re: [PATCH] KVM: MIPS: Make kvm_mips_callbacks const

On 24/2/23 20:28, Sean Christopherson wrote:
> Make kvm_mips_callbacks fully const as it's now hardcoded to point at
> kvm_vz_callbacks, the only remaining the set of callbacks.
>
> Link: https://lore.kernel.org/all/[email protected]
> Suggested-by: Philippe Mathieu-Daudé <[email protected]>
> Signed-off-by: Sean Christopherson <[email protected]>
> ---
> arch/mips/include/asm/kvm_host.h | 2 +-
> arch/mips/kvm/vz.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <[email protected]>

Thanks!

2023-03-24 23:37:48

by Sean Christopherson

Subject: Re: [PATCH] KVM: MIPS: Make kvm_mips_callbacks const

On Fri, 24 Feb 2023 11:28:32 -0800, Sean Christopherson wrote:
> Make kvm_mips_callbacks fully const as it's now hardcoded to point at
> kvm_vz_callbacks, the only remaining the set of callbacks.
>
>

Applied to kvm-x86 generic, thanks!

[1/1] KVM: MIPS: Make kvm_mips_callbacks const
https://github.com/kvm-x86/linux/commit/7ffc2e89518a

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