diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-05-25 10:01:50 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-08-01 03:39:22 -0400 |
commit | 10ab25cd6bf7ee4e5a55d81f203f7dc1a855c27e (patch) | |
tree | 89b1f58c09a102f1aa5c9b549c13e1f9a0a3ee3d /arch/x86/kvm/svm.c | |
parent | 6dc696d4ddf2181eefee361e1d24a49351aef1f6 (diff) |
KVM: x86: Propagate fpu_alloc errors
Memory allocation may fail. Propagate such errors.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 9c68a650f57e..2ae0c3923293 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -904,13 +904,18 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) | |||
904 | svm->asid_generation = 0; | 904 | svm->asid_generation = 0; |
905 | init_vmcb(svm); | 905 | init_vmcb(svm); |
906 | 906 | ||
907 | fx_init(&svm->vcpu); | 907 | err = fx_init(&svm->vcpu); |
908 | if (err) | ||
909 | goto free_page4; | ||
910 | |||
908 | svm->vcpu.arch.apic_base = 0xfee00000 | MSR_IA32_APICBASE_ENABLE; | 911 | svm->vcpu.arch.apic_base = 0xfee00000 | MSR_IA32_APICBASE_ENABLE; |
909 | if (kvm_vcpu_is_bsp(&svm->vcpu)) | 912 | if (kvm_vcpu_is_bsp(&svm->vcpu)) |
910 | svm->vcpu.arch.apic_base |= MSR_IA32_APICBASE_BSP; | 913 | svm->vcpu.arch.apic_base |= MSR_IA32_APICBASE_BSP; |
911 | 914 | ||
912 | return &svm->vcpu; | 915 | return &svm->vcpu; |
913 | 916 | ||
917 | free_page4: | ||
918 | __free_page(hsave_page); | ||
914 | free_page3: | 919 | free_page3: |
915 | __free_pages(nested_msrpm_pages, MSRPM_ALLOC_ORDER); | 920 | __free_pages(nested_msrpm_pages, MSRPM_ALLOC_ORDER); |
916 | free_page2: | 921 | free_page2: |