diff options
author | Avi Kivity <avi@qumranet.com> | 2007-10-21 05:00:39 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:52:55 -0500 |
commit | e00c8cf29b9798eb9918469b0cce1766e0ae40d7 (patch) | |
tree | 2824cf4bfffc96faeda6981a790295c2e4f49690 /drivers/kvm/kvm.h | |
parent | 34c16eecf78ed4cf01f39ac7211f5b57942ec899 (diff) |
KVM: Move vmx_vcpu_reset() out of vmx_vcpu_setup()
Split guest reset code out of vmx_vcpu_setup(). Besides being cleaner, this
moves the realmode tss setup (which can sleep) outside vmx_vcpu_setup()
(which is executed with preemption enabled).
[izik: remove unused variable]
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm.h')
-rw-r--r-- | drivers/kvm/kvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index db18d278c1c0..f7181a407be1 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h | |||
@@ -412,7 +412,7 @@ struct kvm_x86_ops { | |||
412 | /* Create, but do not attach this VCPU */ | 412 | /* Create, but do not attach this VCPU */ |
413 | struct kvm_vcpu *(*vcpu_create)(struct kvm *kvm, unsigned id); | 413 | struct kvm_vcpu *(*vcpu_create)(struct kvm *kvm, unsigned id); |
414 | void (*vcpu_free)(struct kvm_vcpu *vcpu); | 414 | void (*vcpu_free)(struct kvm_vcpu *vcpu); |
415 | void (*vcpu_reset)(struct kvm_vcpu *vcpu); | 415 | int (*vcpu_reset)(struct kvm_vcpu *vcpu); |
416 | 416 | ||
417 | void (*prepare_guest_switch)(struct kvm_vcpu *vcpu); | 417 | void (*prepare_guest_switch)(struct kvm_vcpu *vcpu); |
418 | void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu); | 418 | void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu); |