From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NzzXn-0001py-Ti
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 17:45:47 -0400
Received: from [140.186.70.92] (port=47015 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NzzXd-0001mS-EX
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 17:45:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1NzzXb-0002dN-EW
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 17:45:37 -0400
Received: from hall.aurel32.net ([88.191.82.174]:58760)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1NzzXb-0002ZX-9p
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 17:45:35 -0400
Date: Thu, 8 Apr 2010 21:49:27 +0200
From: Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [PATCH] [S390] Make virtio-pci building
	conditional again
Message-ID: <20100408194927.GP6056@volta.aurel32.net>
References: <1270548703-28636-1-git-send-email-agraf@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <1270548703-28636-1-git-send-email-agraf@suse.de>
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.gnu.org/pipermail/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: Alexander Graf <agraf@suse.de>
Cc: Amit Shah <amit.shah@redhat.com>, qemu-devel@nongnu.org, Bastian Blank <bastian@waldi.eu.org>

On Tue, Apr 06, 2010 at 12:11:43PM +0200, Alexander Graf wrote:
> Commit b305b9d7d6990e492966ffb1fdf619482adeb7e2 made building of virtio-pci
> conditional and not enabled on S390x, because it collides with the S390 bus.
> 
> Commit 087431d1d1bf4e785edfa89e8cd05fcdac558dc3 accidentially reverted that
> behavior, breaking S390x again.
> 
> So here's a follow-up patch disabling building of virtio-pci on S390x again.
> 
> This unbreaks the S390x target.

Thanks, applied.

> Signed-off-by: Alexander Graf <agraf@suse.de>
> ---
>  Makefile.target |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/Makefile.target b/Makefile.target
> index 45cbe56..2624b1d 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -164,7 +164,8 @@ ifdef CONFIG_SOFTMMU
>  obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o
>  # virtio has to be here due to weird dependency between PCI and virtio-net.
>  # need to fix this properly
> -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o
> +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
> +obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
>  obj-y += event_notifier.o
>  obj-y += vhost_net.o
>  obj-$(CONFIG_VHOST_NET) += vhost.o
> -- 
> 1.6.0.2
> 
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net