From 6e27a35622b39e1dc593f369f07590432ddf11ea Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 13 Apr 2011 01:27:55 +0200 Subject: [PATCH] --- yaml --- r: 248039 b: refs/heads/master c: be6d05cfdf1f2ddbdc367a6433d8eac49d6bfe6f h: refs/heads/master i: 248037: e6249d6e94711d2c76aeaebaf8dafbc668f5656f 248035: a2262631df6cb0b625014963ef7e20961e62f886 248031: 52a510580b6c307817c5f031af46ed1ea794f240 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 469f13177af3..d8de759311dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ae441eac521b2006c9f03c4f2a23582c07fd76d +refs/heads/master: be6d05cfdf1f2ddbdc367a6433d8eac49d6bfe6f diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index aabe3334d064..af5206983154 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -4251,8 +4251,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) goto free_vcpu; vmx->guest_msrs = kmalloc(PAGE_SIZE, GFP_KERNEL); + err = -ENOMEM; if (!vmx->guest_msrs) { - err = -ENOMEM; goto uninit_vcpu; } @@ -4271,7 +4271,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) if (err) goto free_vmcs; if (vm_need_virtualize_apic_accesses(kvm)) - if (alloc_apic_access_page(kvm) != 0) + err = alloc_apic_access_page(kvm); + if (err) goto free_vmcs; if (enable_ept) {