aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/kvm/arm.c4
-rw-r--r--arch/mips/kvm/mips.c4
-rw-r--r--arch/powerpc/kvm/powerpc.c4
-rw-r--r--arch/s390/kvm/kvm-s390.c4
-rw-r--r--arch/x86/kvm/x86.c4
-rw-r--r--include/linux/kvm_host.h2
-rw-r--r--virt/kvm/kvm_main.c2
7 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index a99e0cdf8ba2..9f788ebac55b 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -288,6 +288,10 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
288{ 288{
289} 289}
290 290
291void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)
292{
293}
294
291void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 295void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
292{ 296{
293 vcpu->cpu = cpu; 297 vcpu->cpu = cpu;
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index cd7114147ae7..2362df2a79f9 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -1002,6 +1002,10 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
1002{ 1002{
1003} 1003}
1004 1004
1005void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)
1006{
1007}
1008
1005int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 1009int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
1006 struct kvm_translation *tr) 1010 struct kvm_translation *tr)
1007{ 1011{
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 4c79284b58be..cbc432f4f0a6 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -720,6 +720,10 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
720 kvmppc_subarch_vcpu_uninit(vcpu); 720 kvmppc_subarch_vcpu_uninit(vcpu);
721} 721}
722 722
723void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)
724{
725}
726
723void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 727void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
724{ 728{
725#ifdef CONFIG_BOOKE 729#ifdef CONFIG_BOOKE
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index ce81eb2ab76a..a3c324ec4370 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -555,6 +555,10 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
555 /* Nothing todo */ 555 /* Nothing todo */
556} 556}
557 557
558void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)
559{
560}
561
558void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 562void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
559{ 563{
560 save_fp_ctl(&vcpu->arch.host_fpregs.fpc); 564 save_fp_ctl(&vcpu->arch.host_fpregs.fpc);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cd718c01cdf1..7d43dc7bb906 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7171,6 +7171,10 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
7171 static_key_slow_dec(&kvm_no_apic_vcpu); 7171 static_key_slow_dec(&kvm_no_apic_vcpu);
7172} 7172}
7173 7173
7174void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)
7175{
7176}
7177
7174int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 7178int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
7175{ 7179{
7176 if (type) 7180 if (type)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index a4c33b34fe3f..ebd723676633 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -624,6 +624,8 @@ void kvm_arch_exit(void);
624int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 624int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
625void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu); 625void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu);
626 626
627void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu);
628
627void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu); 629void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu);
628void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu); 630void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
629void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu); 631void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 39b16035386f..5a0817ee996e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3124,6 +3124,8 @@ static void kvm_sched_in(struct preempt_notifier *pn, int cpu)
3124 if (vcpu->preempted) 3124 if (vcpu->preempted)
3125 vcpu->preempted = false; 3125 vcpu->preempted = false;
3126 3126
3127 kvm_arch_sched_in(vcpu, cpu);
3128
3127 kvm_arch_vcpu_load(vcpu, cpu); 3129 kvm_arch_vcpu_load(vcpu, cpu);
3128} 3130}
3129 3131