* [PATCH] kvm: get rid of unused label warning
@ 2009-12-18 8:41 Heiko Carstens
2009-12-20 12:16 ` Avi Kivity
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Carstens @ 2009-12-18 8:41 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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>
---
Adds even more ifdefery...
virt/kvm/kvm_main.c | 3 +++
1 file changed, 3 insertions(+)
--- 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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] kvm: get rid of unused label warning
2009-12-18 8:41 [PATCH] kvm: get rid of unused label warning Heiko Carstens
@ 2009-12-20 12:16 ` Avi Kivity
0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2009-12-20 12:16 UTC (permalink / raw)
To: Heiko Carstens; +Cc: Marcelo Tosatti, kvm
On 12/18/2009 10:41 AM, Heiko Carstens wrote:
> From: Heiko Carstens<heiko.carstens@de.ibm.com>
>
> 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
>
Thanks, applied and queued for 2.6.33. I'll refactor it a bit for .34
to reduce the ifdefs.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-20 12:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-18 8:41 [PATCH] kvm: get rid of unused label warning Heiko Carstens
2009-12-20 12:16 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox