From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59770 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9gsG-0008Lh-8u for qemu-devel@nongnu.org; Sat, 23 Oct 2010 12:23:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9gs7-0007Sw-Hd for qemu-devel@nongnu.org; Sat, 23 Oct 2010 12:23:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9gs7-0007Pj-9r for qemu-devel@nongnu.org; Sat, 23 Oct 2010 12:23:07 -0400 Date: Sat, 23 Oct 2010 18:16:33 +0200 From: "Michael S. Tsirkin" Message-ID: <20101023161633.GA11488@redhat.com> References: <20101022193845.10161.52907.stgit@s20.home> <20101022204037.10161.83407.stgit@s20.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101022204037.10161.83407.stgit@s20.home> Subject: [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org On Fri, Oct 22, 2010 at 02:40:39PM -0600, Alex Williamson wrote: > 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 Why? We just moved it from .target to .objs, see 889e30cc18e21f2091b77267dca8096d7dd34f8b. > --- > > 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"