From patchwork Tue Oct 6 12:21:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 51915 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n96CSYhb027253 for ; Tue, 6 Oct 2009 12:28:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932293AbZJFMYT (ORCPT ); Tue, 6 Oct 2009 08:24:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932289AbZJFMYT (ORCPT ); Tue, 6 Oct 2009 08:24:19 -0400 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 Received: from redhat.com (dhcp-0-94.tlv.redhat.com [10.35.0.94]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n96CNngL031560; Tue, 6 Oct 2009 08:23:50 -0400 Date: Tue, 6 Oct 2009 14:21:50 +0200 From: "Michael S. Tsirkin" To: avi@redhat.com, kvm@vger.kernel.org, gleb@redhat.com Subject: [PATCH] qemu-kvm: move msi-x to Makefile.target Message-ID: <20091006122150.GA9525@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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