From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCH] qemu-kvm: move msi-x to Makefile.target Date: Tue, 6 Oct 2009 14:21:50 +0200 Message-ID: <20091006122150.GA9525@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: avi@redhat.com, kvm@vger.kernel.org, gleb@redhat.com Return-path: Received: from mx1.redhat.com ([209.132.183.28]:40415 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932285AbZJFMYS (ORCPT ); Tue, 6 Oct 2009 08:24:18 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n96CNqcG015317 for ; Tue, 6 Oct 2009 08:23:52 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: KVM interrupt injection support depends on target, so MSI-X needs to be in Makefile.target for interrupt injection to work. We'll be able to clean it up once interrupt injection is upstream. This fixes virtio breakage with kvm caused by 263b7947327e13. Signed-off-by: Michael S. Tsirkin --- Makefile.hw | 4 +++- Makefile.target | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile.hw b/Makefile.hw index 830902b..dcb61aa 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -22,7 +22,9 @@ obj-y += m48t59.o escc.o # PCI watchdog devices obj-y += wdt_i6300esb.o -obj-y += msix.o +# MSI-X depends on kvm for interrupt injection, +# so moved it from Makefile.hw to Makefile.target for now +# obj-y += msix.o # PCI network cards obj-y += ne2000.o diff --git a/Makefile.target b/Makefile.target index e991fa3..acee285 100644 --- a/Makefile.target +++ b/Makefile.target @@ -162,6 +162,9 @@ obj-y = vl.o monitor.o pci.o isa_mmio.o machine.o \ # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o +# MSI-X depends on kvm for interrupt injection, +# so moved it from Makefile.hw to Makefile.target for now +obj-y += msix.o LIBS+=-lz -- 1.6.5.rc2