From patchwork Fri Oct 22 20:40:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 68965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE682B70CD for ; Sat, 23 Oct 2010 07:41:50 +1100 (EST) Received: from localhost ([127.0.0.1]:52374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9OQt-00026L-UM for incoming@patchwork.ozlabs.org; Fri, 22 Oct 2010 16:41:47 -0400 Received: from [140.186.70.92] (port=37030 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9OPq-00022j-C0 for qemu-devel@nongnu.org; Fri, 22 Oct 2010 16:40:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9OPo-0004PU-U4 for qemu-devel@nongnu.org; Fri, 22 Oct 2010 16:40:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9OPo-0004PQ-NZ for qemu-devel@nongnu.org; Fri, 22 Oct 2010 16:40:40 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9MKedJd025904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 22 Oct 2010 16:40:40 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9MKedl2016344; Fri, 22 Oct 2010 16:40:39 -0400 From: Alex Williamson To: mst@redhat.com Date: Fri, 22 Oct 2010 14:40:39 -0600 Message-ID: <20101022204037.10161.83407.stgit@s20.home> In-Reply-To: <20101022193845.10161.52907.stgit@s20.home> References: <20101022193845.10161.52907.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We need to pull in config.h or else kvm.h doesn't pull in linux/config.h, which we need if we ever want KVM_CAP_IRQCHIP defined. This requires moving the object over to Makefile.target or else we can't find config-target.h Signed-off-by: Alex Williamson --- Makefile.objs | 2 -- Makefile.target | 1 + hw/msix.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index ca2d2d0..c097d25 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -201,8 +201,6 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o -hw-obj-y += msix.o - # PCI network cards hw-obj-y += ne2000.o hw-obj-y += eepro100.o diff --git a/Makefile.target b/Makefile.target index 347ad6b..63da13b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -185,6 +185,7 @@ obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-y += memory.o +obj-y += msix.o LIBS+=-lz diff --git a/hw/msix.c b/hw/msix.c index 4122395..23256c9 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -11,6 +11,7 @@ * the COPYING file in the top-level directory. */ +#include "config.h" #include "hw.h" #include "msix.h" #include "pci.h"