From patchwork Tue Apr 6 10:11:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 49491 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 561B3B7D0E for ; Tue, 6 Apr 2010 20:18:20 +1000 (EST) Received: from localhost ([127.0.0.1]:36630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz5rN-0002nW-3M for incoming@patchwork.ozlabs.org; Tue, 06 Apr 2010 06:18:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz5l9-0007kl-Jz for qemu-devel@nongnu.org; Tue, 06 Apr 2010 06:11:51 -0400 Received: from [140.186.70.92] (port=41158 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz5l7-0007jR-1A for qemu-devel@nongnu.org; Tue, 06 Apr 2010 06:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz5l5-00040m-2e for qemu-devel@nongnu.org; Tue, 06 Apr 2010 06:11:48 -0400 Received: from cantor.suse.de ([195.135.220.2]:47539 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz5l4-00040d-Ta for qemu-devel@nongnu.org; Tue, 06 Apr 2010 06:11:47 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id C01705362F; Tue, 6 Apr 2010 12:11:45 +0200 (CEST) From: Alexander Graf To: qemu-devel@nongnu.org Date: Tue, 6 Apr 2010 12:11:43 +0200 Message-Id: <1270548703-28636-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Amit Shah , Bastian Blank , Aurelien Jarno Subject: [Qemu-devel] [PATCH] [S390] Make virtio-pci building conditional again 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 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. Signed-off-by: Alexander Graf --- 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