From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Borntraeger Subject: [patch 2/4] kvm-s390: fix return value of kvm_arch_init_vm Date: Tue, 18 Oct 2011 12:27:13 +0200 Message-ID: <20111018103127.070441577@de.ibm.com> References: <20111018102711.259185287@de.ibm.com> Cc: Carsten Otte , Heiko Carstens , Martin Schwidefsky , KVM , Christian Borntraeger To: Avi Kivity , Marcelo Tossati Return-path: Received: from mtagate3.uk.ibm.com ([194.196.100.163]:36641 "EHLO mtagate3.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757400Ab1JRKb3 (ORCPT ); Tue, 18 Oct 2011 06:31:29 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p9IAVSiq018898 for ; Tue, 18 Oct 2011 10:31:28 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9IAVRuI2449636 for ; Tue, 18 Oct 2011 11:31:27 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9IAVR6u028115 for ; Tue, 18 Oct 2011 04:31:27 -0600 Content-Disposition: inline; filename=501-kvm-arch_init_vm.diff Sender: kvm-owner@vger.kernel.org List-ID: From: Carsten Otte This patch fixes the return value of kvm_arch_init_vm in case a memory allocation goes wrong. Signed-off-by: Carsten Otte Signed-off-by: Christian Borntraeger --- arch/s390/kvm/kvm-s390.c | 2 ++ 1 file changed, 2 insertions(+) Index: b/arch/s390/kvm/kvm-s390.c =================================================================== --- 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;