commit b290411a1321dd937dce4aaa812e5d8fae8a14a5
author Carsten Otte <cotte@de.ibm.com> Tue Oct 18 12:27:13 2011 +0200
committer Avi Kivity <avi@redhat.com> Sun Oct 30 12:23:55 2011 +0200
tree 00fd0ae4b160736f5fc9055ecc7822d4361cf7f1
parent 4d47555a80495657161a7e71ec3014ff2021e450

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>

arch/s390/kvm/kvm-s390.c

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 0cba935..397f0cb 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -175,6 +175,8 @@
 	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;