From patchwork Mon Jan 4 17:34:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 42077 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 9D21AB7B6B for ; Tue, 5 Jan 2010 05:14:31 +1100 (EST) Received: from localhost ([127.0.0.1]:38173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRr4U-00072j-Ot for incoming@patchwork.ozlabs.org; Mon, 04 Jan 2010 12:50:26 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRqqQ-0002S0-UQ for qemu-devel@nongnu.org; Mon, 04 Jan 2010 12:35:55 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRqqM-0002NW-1n for qemu-devel@nongnu.org; Mon, 04 Jan 2010 12:35:54 -0500 Received: from [199.232.76.173] (port=41096 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRqqL-0002NG-R3 for qemu-devel@nongnu.org; Mon, 04 Jan 2010 12:35:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29247) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRqqK-0000J9-0b for qemu-devel@nongnu.org; Mon, 04 Jan 2010 12:35:48 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o04HZjZk017337 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 4 Jan 2010 12:35:45 -0500 Received: from localhost (vpn-245-200.phx2.redhat.com [10.3.245.200]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o04HZiw2023752; Mon, 4 Jan 2010 12:35:44 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Mon, 4 Jan 2010 23:04:17 +0530 Message-Id: <1262626457-26671-9-git-send-email-amit.shah@redhat.com> In-Reply-To: <1262626457-26671-8-git-send-email-amit.shah@redhat.com> References: <1262626457-26671-1-git-send-email-amit.shah@redhat.com> <1262626457-26671-2-git-send-email-amit.shah@redhat.com> <1262626457-26671-3-git-send-email-amit.shah@redhat.com> <1262626457-26671-4-git-send-email-amit.shah@redhat.com> <1262626457-26671-5-git-send-email-amit.shah@redhat.com> <1262626457-26671-6-git-send-email-amit.shah@redhat.com> <1262626457-26671-7-git-send-email-amit.shah@redhat.com> <1262626457-26671-8-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , kraxel@redhat.com, agraf@suse.de, armbru@redhat.com Subject: [Qemu-devel] [PATCH 8/8] Move virtio-serial and virtio-serial-bus 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..60b954e 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 virtio-serial-bus.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..d7e1702 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 obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.o LIBS+=-lz