diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-08 10:50:48 +1000 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 17:52:50 +0200 |
| commit | 76fafa5e22bd82e92d2734852ba23f17322d675a (patch) | |
| tree | f7b81035e86b5b26cbb2d2d13958c805f4990589 /drivers/kvm/vmx.c | |
| parent | d589444e924bc72e42fa94853f9096589d69374d (diff) | |
KVM: Hoist kvm_create_lapic() into kvm_vcpu_init()
Move kvm_create_lapic() into kvm_vcpu_init(), rather than having svm
and vmx do it. And make it return the error rather than a fairly
random -ENOMEM.
This also solves the problem that neither svm.c nor vmx.c actually
handles the error path properly.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/vmx.c')
| -rw-r--r-- | drivers/kvm/vmx.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 894fd45ecc9..7b742901e78 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -2431,12 +2431,6 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) if (err) goto free_vcpu; - if (irqchip_in_kernel(kvm)) { - err = kvm_create_lapic(&vmx->vcpu); - if (err < 0) - goto free_vcpu; - } - vmx->guest_msrs = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!vmx->guest_msrs) { err = -ENOMEM; |