aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2011-10-18 12:27:13 +0200
committerAvi Kivity <avi@redhat.com>2011-10-30 12:23:55 +0200
commitb290411a1321dd937dce4aaa812e5d8fae8a14a5 (patch)
tree00fd0ae4b160736f5fc9055ecc7822d4361cf7f1
parentKVM: s390: check cpu_id prior to using it (diff)
downloadlinux-dev-b290411a1321dd937dce4aaa812e5d8fae8a14a5.tar.xz
linux-dev-b290411a1321dd937dce4aaa812e5d8fae8a14a5.zip
KVM: s390: fix return value of kvm_arch_init_vm
This patch fixes the return value of kvm_arch_init_vm in case a memory allocation goes wrong. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/s390/kvm/kvm-s390.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 0cba935d1282..397f0cbc8b76 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -175,6 +175,8 @@ int kvm_arch_init_vm(struct kvm *kvm)
if (rc)
goto out_err;
+ rc = -ENOMEM;
+
kvm->arch.sca = (struct sca_block *) get_zeroed_page(GFP_KERNEL);
if (!kvm->arch.sca)
goto out_err;