From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: Build breakage between kvm-userspace.git HEAD and 2.6.29-rc8 Date: Sun, 15 Mar 2009 12:19:15 +0200 Message-ID: <20090315101915.GF10892@redhat.com> References: <49BA7D77.1010003@gmail.com> <49BCC914.4070204@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=cp1255 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Gregory Haskins , kvm@vger.kernel.org, Mark McLoughlin , Weidong Han To: Avi Kivity Return-path: Received: from mx2.redhat.com ([66.187.237.31]:50250 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753273AbZCOKXD convert rfc822-to-8bit (ORCPT ); Sun, 15 Mar 2009 06:23:03 -0400 Content-Disposition: inline In-Reply-To: <49BCC914.4070204@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Sun, Mar 15, 2009 at 11:23:32AM +0200, Avi Kivity wrote: > Gregory Haskins wrote: >> Hi kvm-devs, >> Been away from the kvm scene for a while...hope everyone is well. >> >> FYI: There are a few build breakages between kvm-userspace.git HEAD >> (f29d402ab885d30bfa7350378cff911c9c17a226) when you compile against >> Linus' linux-2.6.git HEAD >> (v2.6.29-rc8-041b62374c7fedc11a8a1eeda2868612d3d1436c) >> >> I am not sure if this is a supported configuration (e.g. perhaps you >> only support building kvm-userspace HEAD against Avi's kernel tree?)= =2E =20 >> But in case this was unintentional, read on... >> =20 > > It's a semi-supported configuration. We don't test it, but we'll fix= =20 > reported bugs (or apply patches...). > >> First error: >> >> libkvm.c:702: error: =91struct kvm_irq_level=92 has no member named = =91status=92 >> make[1]: *** [libkvm.o] Error 1 >> >> Which is attributable to: >> >> commit ea1b668e7684dc43e9d198ba0b25fe47a0b2acd2 >> Author: Gleb Natapov >> Date: Wed Feb 4 17:30:01 2009 +0200 >> >> kvm: qemu: handle IRQ status injection in userspace >> =20 > > This is due to a missing #ifdef KVM_CAP_... somewhere. > > Gleb, can you take a look? > Does this help? Signed-off-by: Gleb Natapov diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c index 0ac1c28..3e6bef1 100644 --- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -667,9 +667,14 @@ int kvm_set_irq_level(kvm_context_t kvm, int irq, = int level, int *status) if (r =3D=3D -1) perror("kvm_set_irq_level"); =20 - if (status) + if (status) { +#if defined(KVM_CAP_IRQ_INJECT_STATUS) && defined(KVM_IRQ_LINE_STATUS) *status =3D (kvm->irqchip_inject_ioctl =3D=3D KVM_IRQ_LINE) ? 1 : event.status; +#else + *status =3D 1; +#endif + } =20 return 1; } -- Gleb.