From patchwork Thu Jan 7 07:31:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 42405 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 1F322B6EDF for ; Thu, 7 Jan 2010 18:55:26 +1100 (EST) Received: from localhost ([127.0.0.1]:59578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSnDG-0001ct-03 for incoming@patchwork.ozlabs.org; Thu, 07 Jan 2010 02:55:22 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSmru-0004OV-Qm for qemu-devel@nongnu.org; Thu, 07 Jan 2010 02:33:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSmrq-0004JA-1x for qemu-devel@nongnu.org; Thu, 07 Jan 2010 02:33:18 -0500 Received: from [199.232.76.173] (port=59388 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSmrp-0004Ir-Pm for qemu-devel@nongnu.org; Thu, 07 Jan 2010 02:33:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26318) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSmrp-0004t4-9C for qemu-devel@nongnu.org; Thu, 07 Jan 2010 02:33:13 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o077XC7P026733 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Jan 2010 02:33:12 -0500 Received: from localhost (vpn-232-111.phx2.redhat.com [10.3.232.111]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o077XAJo025379; Thu, 7 Jan 2010 02:33:11 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Thu, 7 Jan 2010 13:01:46 +0530 Message-Id: <1262849506-27132-9-git-send-email-amit.shah@redhat.com> In-Reply-To: <1262849506-27132-8-git-send-email-amit.shah@redhat.com> References: <1262849506-27132-1-git-send-email-amit.shah@redhat.com> <1262849506-27132-2-git-send-email-amit.shah@redhat.com> <1262849506-27132-3-git-send-email-amit.shah@redhat.com> <1262849506-27132-4-git-send-email-amit.shah@redhat.com> <1262849506-27132-5-git-send-email-amit.shah@redhat.com> <1262849506-27132-6-git-send-email-amit.shah@redhat.com> <1262849506-27132-7-git-send-email-amit.shah@redhat.com> <1262849506-27132-8-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah Subject: [Qemu-devel] [PATCH 8/8] Move virtio-serial to Makefile.hw 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 There's nothing target-dependent in the virtio-serial code so allow it to be compiled just once for all the targets. Signed-off-by: Amit Shah --- Makefile.hw | 2 +- Makefile.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.hw b/Makefile.hw index bd252f5..b6323fa 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -13,7 +13,7 @@ QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu obj-y = obj-y += loader.o -obj-y += virtio.o +obj-y += virtio.o virtio-serial.o obj-y += fw_cfg.o obj-y += watchdog.o obj-$(CONFIG_ECC) += ecc.o diff --git a/Makefile.target b/Makefile.target index d217f07..475362e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -156,7 +156,7 @@ ifdef CONFIG_SOFTMMU obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.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.o virtio-serial-bus.o virtio-pci.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.o LIBS+=-lz