From patchwork Fri Dec 18 08:41:43 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Heiko Carstens <heiko.carstens@de.ibm.com>
X-Patchwork-Id: 68631
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI8fpQt003053
	for <patchwork-kvm@patchwork.kernel.org>;
	Fri, 18 Dec 2009 08:41:52 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750951AbZLRIlq (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Fri, 18 Dec 2009 03:41:46 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751185AbZLRIlq
	(ORCPT <rfc822;kvm-outgoing>); Fri, 18 Dec 2009 03:41:46 -0500
Received: from mtagate7.uk.ibm.com ([194.196.100.167]:47655 "EHLO
	mtagate7.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750951AbZLRIlp (ORCPT <rfc822; kvm@vger.kernel.org>);
	Fri, 18 Dec 2009 03:41:45 -0500
Received: from d06nrmr1806.portsmouth.uk.ibm.com
	(d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193])
	by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id nBI8fiR3019546
	for <kvm@vger.kernel.org>; Fri, 18 Dec 2009 08:41:44 GMT
Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com
	[9.149.37.228])
	by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with
	ESMTP id nBI8fiQx1433654
	for <kvm@vger.kernel.org>; Fri, 18 Dec 2009 08:41:44 GMT
Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1])
	by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP
	id nBI8fhU9028471
	for <kvm@vger.kernel.org>; Fri, 18 Dec 2009 08:41:44 GMT
Received: from localhost (dyn-9-152-212-23.boeblingen.de.ibm.com
	[9.152.212.23])
	by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.12.11) with
	ESMTP id nBI8fh3b028467; Fri, 18 Dec 2009 08:41:43 GMT
Date: Fri, 18 Dec 2009 09:41:43 +0100
From: Heiko Carstens <heiko.carstens@de.ibm.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org
Subject: [PATCH] kvm: get rid of unused label warning
Message-ID: <20091218084143.GA7728@osiris.boeblingen.de.ibm.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


--- 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);