]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
KVM: s390: fix return value of kvm_arch_init_vm
authorCarsten Otte <cotte@de.ibm.com>
Tue, 18 Oct 2011 10:27:13 +0000 (12:27 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 30 Oct 2011 10:23:55 +0000 (12:23 +0200)
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

index 0cba935d1282ed20e09353bf5419d06246330e37..397f0cbc8b7608f2c6ffa96d30621327eba18803 100644 (file)
@@ -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;