From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Trofimovich Subject: Re: [PATCH] Fix i8259 for target-arches not supporting KVM Date: Mon, 30 Jan 2012 20:15:47 +0300 Message-ID: <20120130201552.7d5efe13@sf.home> References: <1327843081-26239-1-git-send-email-slyfox@inbox.ru> <4F266C25.2020001@siemens.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/o3F8Jpa6cUDwBmr4r5rCvGY"; protocol="application/pgp-signature" Cc: kvm@vger.kernel.org, Avi Kivity To: Jan Kiszka Return-path: Received: from smtp.gentoo.org ([140.211.166.183]:45745 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753349Ab2A3RMo (ORCPT ); Mon, 30 Jan 2012 12:12:44 -0500 In-Reply-To: <4F266C25.2020001@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: --Sig_/o3F8Jpa6cUDwBmr4r5rCvGY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Mon, 30 Jan 2012 11:08:37 +0100 Jan Kiszka wrote: > On 2012-01-29 14:18, Sergei Trofimovich wrote: > > From: Sergei Trofimovich > >=20 > > $ ./configure --target-list=3Dalpha-softmmu && make > >=20 > > CC alpha-softmmu/i8259.o > > cc1: warnings being treated as errors > > /home/slyfox/dev/git/qemu-kvm/hw/i8259.c: In function 'kvm_i8259_se= t_irq': > > /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: implicit de= claration of function 'apic_set_irq_delivered' > >=20 > > /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: nested exte= rn declaration of 'apic_set_irq_delivered' > > make[1]: *** [i8259.o] Error 1 > > make: *** [subdir-alpha-softmmu] Error 2 > >=20 > > LINK alpha-softmmu/qemu-system-alpha > > i8259.o: In function `kvm_i8259_set_irq': > > /tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i825= 9.c:689: undefined reference to `apic_set_irq_delivered' > >=20 > > Signed-off-by: Sergei Trofimovich > > --- > > hw/i8259.c | 3 +++ > > 1 files changed, 3 insertions(+), 0 deletions(-) > >=20 > > diff --git a/hw/i8259.c b/hw/i8259.c > > index 0632ea2..2f6789d 100644 > > --- a/hw/i8259.c > > +++ b/hw/i8259.c > > @@ -21,6 +21,7 @@ > > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALI= NGS IN > > * THE SOFTWARE. > > */ > > +#include "apic.h" >=20 > Won't be needed with current master. >=20 > > #include "hw.h" > > #include "pc.h" > > #include "isa.h" > > @@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState= *s) > > =20 > > static void kvm_i8259_set_irq(void *opaque, int irq, int level) > > { > > +#ifdef CONFIG_KVM > > int pic_ret; > > if (kvm_set_irq(irq, level, &pic_ret)) { > > if (pic_ret !=3D 0) > > apic_set_irq_delivered(); > > return; > > } > > +#endif > > } > > =20 > > device_init(pic_register) >=20 > This might be in trivial conflict with the current version. You should > rebase, already to remove the include. More consistent would be > KVM_CAP_IRQCHIP in fact, but it doesn't matter that much as this code > will go away soon. Yeah, it was. Will redo with KVM_CAP_IRQCHIP you are eager to accept such changes (see below). > BTW, is the reason for using this repository instead of qemu upstream > for non-x86 related to packaging? It's not qemu-kvm's normal use case > (which doesn't mean it is allowed to break). Yeah, I build-only qemu-kvm and use qemu for exotics. I thought it would help later merging of qemu and qemu-kvm. If it does not make sense for you (and only creates annoying merge collisions) I'll stop bothering kvm@ otherwise I'll amend things and resend :] (ppc trivially broke as well after recent acpi merge). Thanks! --=20 Sergei --Sig_/o3F8Jpa6cUDwBmr4r5rCvGY Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk8m0FYACgkQcaHudmEf86reOwCcDoWIf6SutWxdKtgyduvURQ2q fxUAn2kEnl60YLjqaNqC2/kV8HB0zlDO =p6XI -----END PGP SIGNATURE----- --Sig_/o3F8Jpa6cUDwBmr4r5rCvGY--