summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-12-18 09:41:43 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2009-12-27 13:36:34 -0200
commitb4329db0d7fd5a233866e799ad3bae8639e90c71 (patch)
tree256fffaecca174320354c4de83022b00ba358a22
parent5279aeb4b96cbdac22a0c2f8137dd0bbc35f02b8 (diff)
downloadop-kernel-dev-b4329db0d7fd5a233866e799ad3bae8639e90c71.zip
op-kernel-dev-b4329db0d7fd5a233866e799ad3bae8639e90c71.tar.gz
KVM: get rid of kvm_create_vm() unused label warning on s390
arch/s390/kvm/../../../virt/kvm/kvm_main.c: In function 'kvm_create_vm': arch/s390/kvm/../../../virt/kvm/kvm_main.c:409: warning: label 'out_err' defined but not used Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--virt/kvm/kvm_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7db071b..a944be3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -406,8 +406,11 @@ static struct kvm *kvm_create_vm(void)
out:
return kvm;
+#if defined(KVM_COALESCED_MMIO_PAGE_OFFSET) || \
+ (defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER))
out_err:
hardware_disable_all();
+#endif
out_err_nodisable:
kfree(kvm);
return ERR_PTR(r);
OpenPOWER on IntegriCloud