diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-18 07:41:00 +0800 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-04-22 10:56:44 +0300 |
| commit | f1797359216c1daa145a354d07b8b2b7459668f4 (patch) | |
| tree | 9e45d3570f332ac3c2e09490b86223877e7fba9a /arch/x86/kvm | |
| parent | 8a1b9dd0006bce5cc770fd80bc95f9916670c151 (diff) | |
| download | blackbird-op-linux-f1797359216c1daa145a354d07b8b2b7459668f4.tar.gz blackbird-op-linux-f1797359216c1daa145a354d07b8b2b7459668f4.zip | |
KVM: x86: fix error return code in kvm_arch_vcpu_init()
Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 50e2e10b8041..cbe16b4cad5c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6752,8 +6752,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) } vcpu->arch.mcg_cap = KVM_MAX_MCE_BANKS; - if (!zalloc_cpumask_var(&vcpu->arch.wbinvd_dirty_mask, GFP_KERNEL)) + if (!zalloc_cpumask_var(&vcpu->arch.wbinvd_dirty_mask, GFP_KERNEL)) { + r = -ENOMEM; goto fail_free_mce_banks; + } r = fx_init(vcpu); if (r) |
