[patch 56/88] KVM: call kvm_arch_vcpu_reset() instead of the kvm_x86_ops callback

Greg KH
2009-04-30T17:32:57Z

[-- Attachment #1: kvm-call-kvm_arch_vcpu_reset-instead-of-the-kvm_x86_ops-callback.patch --]
[-- Type: text/plain, Size: 916 bytes --]

2.6.28-stable review patch. If anyone has any objections, please let us know.

------------------

From: Gleb Natapov <gleb@redhat.com>

(cherry picked from 5f179287fa02723215eecf681d812b303c243973)

Call kvm_arch_vcpu_reset() instead of directly using arch callback.
The function does additional things.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/x86/kvm/x86.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2973,7 +2973,7 @@ static int __vcpu_run(struct kvm_vcpu *v
pr_debug("vcpu %d received sipi with vector # %x\n",
vcpu->vcpu_id, vcpu->arch.sipi_vector);
kvm_lapic_reset(vcpu);
- r = kvm_x86_ops->vcpu_reset(vcpu);
+ r = kvm_arch_vcpu_reset(vcpu);
if (r)
return r;
vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;