From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:59827)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1TrB9O-0000pr-I6
	for qemu-devel@nongnu.org; Fri, 04 Jan 2013 12:33:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1TrB9N-000738-J2
	for qemu-devel@nongnu.org; Fri, 04 Jan 2013 12:33:46 -0500
Received: from mail-wi0-f171.google.com ([209.85.212.171]:50026)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1TrB9N-00072O-CW
	for qemu-devel@nongnu.org; Fri, 04 Jan 2013 12:33:45 -0500
Received: by mail-wi0-f171.google.com with SMTP id hn14so54759wib.16
	for <qemu-devel@nongnu.org>; Fri, 04 Jan 2013 09:33:44 -0800 (PST)
Date: Fri, 4 Jan 2013 18:33:41 +0100
From: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20130104173341.GA9481@stefanha-thinkpad.redhat.com>
References: <20121220142037.GA23513@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20121220142037.GA23513@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] MAkefile: dont rebuild vhost for each
	target
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Anthony Liguori <aliguori@us.ibm.com>, Jason Baron <jbaron@redhat.com>, qemu-devel@nongnu.org, Blue Swirl <blauwirbel@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Andreas =?iso-8859-1?Q?F=E4rber?= <afaerber@suse.de>

On Thu, Dec 20, 2012 at 04:20:37PM +0200, Michael S. Tsirkin wrote:
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 2778035..360a43c 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -3,6 +3,9 @@ common-obj-y += loader.o
>  common-obj-$(CONFIG_VIRTIO) += virtio-console.o
>  common-obj-$(CONFIG_VIRTIO) += virtio-rng.o
>  common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
> +common-obj-$(CONFIG_VHOST_NET) += vhost_net.o
> +common-obj-$(CONFIG_VHOST_NET) += vhost.o
> +common-obj-$(CONFIG_NO_VHOST_NET) += vhost_net_stub.o
>  common-obj-y += fw_cfg.o
>  common-obj-$(CONFIG_PCI) += pci_bridge_dev.o
>  common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
> @@ -192,8 +195,6 @@ common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o xenfb.o xen_disk.o xen_nic.o
>  # need to fix this properly
>  obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
>  obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o virtio-scsi.o
> -obj-$(CONFIG_SOFTMMU) += vhost_net.o
> -obj-$(CONFIG_VHOST_NET) += vhost.o
>  obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
>  obj-$(CONFIG_VGA) += vga.o
>  obj-$(CONFIG_SOFTMMU) += device-hotplug.o

Careful, this change means that you're now including the system-wide
/usr/include/linux/vhost.h header file instead of QEMU's
linux-headers/linux/vhost.h.

I recently hit this with the dataplane patches since they include
virtio_ring.h.

On an outdated build host we may run into trouble when relying on the
system-wide header file.

(The -I linux-headers/ is only added in Makefile.target.)

Stefan