From patchwork Sat Nov 27 00:07:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Brook X-Patchwork-Id: 73254 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 D8A4CB70E3 for ; Sat, 27 Nov 2010 11:14:27 +1100 (EST) Received: from localhost ([127.0.0.1]:50890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM8Qr-0002Rr-6j for incoming@patchwork.ozlabs.org; Fri, 26 Nov 2010 19:14:25 -0500 Received: from [140.186.70.92] (port=52017 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM8LF-0007l4-H8 for qemu-devel@nongnu.org; Fri, 26 Nov 2010 19:08:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PM8LE-00059p-F1 for qemu-devel@nongnu.org; Fri, 26 Nov 2010 19:08:37 -0500 Received: from gateway.codesourcery.com ([38.113.113.105]:57908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PM8LE-00059X-8G for qemu-devel@nongnu.org; Fri, 26 Nov 2010 19:08:36 -0500 Received: from wren.home (localhost [127.0.0.1]) by gateway.codesourcery.com (Postfix) with ESMTP id 1C45A68055; Fri, 26 Nov 2010 16:08:34 -0800 (PST) From: Paul Brook To: qemu-devel@nongnu.org Date: Sat, 27 Nov 2010 00:07:39 +0000 Message-Id: <1290816459-31009-4-git-send-email-paul@codesourcery.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1290816459-31009-1-git-send-email-paul@codesourcery.com> References: <1290816459-31009-1-git-send-email-paul@codesourcery.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Paul Brook Subject: [Qemu-devel] [PATCH 3/3] VirtIO config option 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 Make virtio devices optional. Selecting individual devices is not useful as the host bindings are all in one file. Signed-off-by: Paul Brook --- Makefile.objs | 10 ++++++++-- Makefile.target | 4 ++-- default-configs/s390x-softmmu.mak | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 9e85b04..72c6c7f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -42,6 +42,11 @@ net-nested-$(CONFIG_SLIRP) += slirp.o net-nested-$(CONFIG_VDE) += vde.o net-obj-y += $(addprefix net/, $(net-nested-y)) +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy) +# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. +# only pull in the actual virtio-9p device if we also enabled virtio. +CONFIG_REALLY_VIRTFS=y +endif fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) @@ -159,7 +164,7 @@ user-obj-y += cutils.o cache-utils.o hw-obj-y = hw-obj-y += vl.o loader.o -hw-obj-y += virtio.o virtio-console.o +hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o hw-obj-y += fw_cfg.o # FIXME: Core PCI code and its direct dependencies are required by the # QMP query-pci command. @@ -264,7 +269,8 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) -hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o virtio-9p-xattr.o +hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o +hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o ###################################################################### diff --git a/Makefile.target b/Makefile.target index 853045a..5784844 100644 --- a/Makefile.target +++ b/Makefile.target @@ -188,11 +188,11 @@ ifdef CONFIG_SOFTMMU obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.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-serial-bus.o +obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o -obj-$(CONFIG_VIRTFS) += virtio-9p.o +obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index e69de29..16d7259 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -0,0 +1 @@ +include virtio.mak