From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH] Fix i8259 for target-arches not supporting KVM Date: Mon, 30 Jan 2012 22:13:39 +0100 Message-ID: <4F270803.4060509@web.de> References: <1327843081-26239-1-git-send-email-slyfox@inbox.ru> <4F266C25.2020001@siemens.com> <20120130201552.7d5efe13@sf.home> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Avi Kivity To: Sergei Trofimovich Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:58176 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752571Ab2A3VNm (ORCPT ); Mon, 30 Jan 2012 16:13:42 -0500 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate02.web.de (Postfix) with ESMTP id EE5A71C08D201 for ; Mon, 30 Jan 2012 22:13:40 +0100 (CET) In-Reply-To: <20120130201552.7d5efe13@sf.home> Sender: kvm-owner@vger.kernel.org List-ID: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2012-01-30 18:15, Sergei Trofimovich wrote: > On Mon, 30 Jan 2012 11:08:37 +0100 Jan Kiszka > wrote: > >> On 2012-01-29 14:18, Sergei Trofimovich wrote: >>> From: Sergei Trofimovich >>> >>> $ ./configure --target-list=alpha-softmmu && make >>> >>> CC alpha-softmmu/i8259.o cc1: warnings being treated as >>> errors /home/slyfox/dev/git/qemu-kvm/hw/i8259.c: In function >>> 'kvm_i8259_set_irq': >>> /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: >>> implicit declaration of function 'apic_set_irq_delivered' >>> >>> /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: nested >>> extern declaration of 'apic_set_irq_delivered' make[1]: *** >>> [i8259.o] Error 1 make: *** [subdir-alpha-softmmu] Error 2 >>> >>> 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/i8259.c:689: >>> undefined reference to `apic_set_irq_delivered' >>> >>> Signed-off-by: Sergei Trofimovich --- >>> hw/i8259.c | 3 +++ 1 files changed, 3 insertions(+), 0 >>> deletions(-) >>> >>> 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 >>> DEALINGS IN * THE SOFTWARE. */ +#include "apic.h" >> >> Won't be needed with current master. >> >>> #include "hw.h" #include "pc.h" #include "isa.h" @@ -682,12 >>> +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState >>> *s) >>> >>> 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 != 0) >>> apic_set_irq_delivered(); return; } +#endif } >>> >>> device_init(pic_register) >> >> 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). Helping to clean up things is always appreciated. While the code here will not make it into upstream, other bits may - or will at least serve as blueprints for the upstream patches. And maybe certain distros will like this as well. Some used to build QEMU out of qemu-kvm sources, IIRC. Just make sure that a fix is not actually addressing an upstream issue. Then it should go there first. Thanks, Jan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk8nCAMACgkQitSsb3rl5xRq0wCeNMkGrJMREb4W0SL8yeo8k/js vRAAn0eNdzetHn58OyFC0IUbQsArj3c9 =E0j2 -----END PGP SIGNATURE-----