From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54324 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P9TFL-0005wz-TR
	for qemu-devel@nongnu.org; Fri, 22 Oct 2010 21:50:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.williamson@redhat.com>) id 1P9TFK-0006sN-MI
	for qemu-devel@nongnu.org; Fri, 22 Oct 2010 21:50:11 -0400
Received: from mx1.redhat.com ([209.132.183.28]:19126)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.williamson@redhat.com>) id 1P9TFK-0006sF-Em
	for qemu-devel@nongnu.org; Fri, 22 Oct 2010 21:50:10 -0400
From: Alex Williamson <alex.williamson@redhat.com>
In-Reply-To: <20101022204037.10161.83407.stgit@s20.home>
References: <20101022193845.10161.52907.stgit@s20.home>
	<20101022204037.10161.83407.stgit@s20.home>
Content-Type: text/plain; charset="UTF-8"
Date: Fri, 22 Oct 2010 19:50:06 -0600
Message-ID: <1287798606.5129.1.camel@x201>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: mst@redhat.com
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org

On Fri, 2010-10-22 at 14:40 -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 <alex.williamson@redhat.com>
> ---
> 
>  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

Oops, memory.c isn't upstream, I'll push it down in my patch queue and
send a new one.

Alex

>  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"
>