diff options
| author | James Hogan <james.hogan@imgtec.com> | 2017-03-14 11:15:23 +0100 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2017-03-28 15:53:49 +0200 |
| commit | edab4fe1f6419fc3a1de3b134929ae2123bea3ad (patch) | |
| tree | 96276ad80364be42514b6243b74a032954e04087 /arch/mips/kvm | |
| parent | KVM: MIPS: Add callback to check extension (diff) | |
| download | linux-edab4fe1f6419fc3a1de3b134929ae2123bea3ad.tar.xz linux-edab4fe1f6419fc3a1de3b134929ae2123bea3ad.zip | |
KVM: MIPS: Add hardware_{enable,disable} callback
Add an implementation callback for the kvm_arch_hardware_enable() and
kvm_arch_hardware_disable() architecture functions, with simple stubs
for trap & emulate. This is in preparation for VZ which will make use of
them.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Diffstat (limited to 'arch/mips/kvm')
| -rw-r--r-- | arch/mips/kvm/mips.c | 7 | ||||
| -rw-r--r-- | arch/mips/kvm/trap_emul.c | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 78d58c2528a9..5681117083af 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -92,7 +92,12 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) int kvm_arch_hardware_enable(void) { - return 0; + return kvm_mips_callbacks->hardware_enable(); +} + +void kvm_arch_hardware_disable(void) +{ + kvm_mips_callbacks->hardware_disable(); } int kvm_arch_hardware_setup(void) diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c index db3c48634eda..50b812bfe083 100644 --- a/arch/mips/kvm/trap_emul.c +++ b/arch/mips/kvm/trap_emul.c @@ -488,6 +488,15 @@ static int kvm_trap_emul_handle_msa_disabled(struct kvm_vcpu *vcpu) return ret; } +static int kvm_trap_emul_hardware_enable(void) +{ + return 0; +} + +static void kvm_trap_emul_hardware_disable(void) +{ +} + static int kvm_trap_emul_check_extension(struct kvm *kvm, long ext) { int r; @@ -1254,6 +1263,8 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { .handle_fpe = kvm_trap_emul_handle_fpe, .handle_msa_disabled = kvm_trap_emul_handle_msa_disabled, + .hardware_enable = kvm_trap_emul_hardware_enable, + .hardware_disable = kvm_trap_emul_hardware_disable, .check_extension = kvm_trap_emul_check_extension, .vcpu_init = kvm_trap_emul_vcpu_init, .vcpu_uninit = kvm_trap_emul_vcpu_uninit, |