From patchwork Mon Aug 10 19:30:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 31104 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 bilbo.ozlabs.org (Postfix) with ESMTPS id D016FB6F1F for ; Tue, 11 Aug 2009 05:32:22 +1000 (EST) Received: from localhost ([127.0.0.1]:55757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MaabT-0002LH-RE for incoming@patchwork.ozlabs.org; Mon, 10 Aug 2009 15:32:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Maaav-0002H2-Kn for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:31:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Maaar-0002Dv-3R for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:31:45 -0400 Received: from [199.232.76.173] (port=37099 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Maaaq-0002Dl-OE for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:31:40 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42110) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Maaaq-0005A9-AK for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:31:40 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7AJVc7A014961; Mon, 10 Aug 2009 15:31:38 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7AJVbEf019205; Mon, 10 Aug 2009 15:31:37 -0400 Received: from redhat.com (vpn-6-19.tlv.redhat.com [10.35.6.19]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7AJVZed003323; Mon, 10 Aug 2009 15:31:36 -0400 Date: Mon, 10 Aug 2009 22:30:24 +0300 From: "Michael S. Tsirkin" To: anthony@codemonkey.ws, qemu-devel@nongnu.org Message-ID: <20090810193024.GA16815@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Subject: [Qemu-devel] [PATCH] qemu: move virtio-pci.o to near pci.o 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 virtio-pci depends, and will always depend, on pci.c so it makes sense to keep it in the same makefile, (unlike the rest of virtio files which should eventually be moved out to Makefile.hw). Signed-off-by: Michael S. Tsirkin --- This came about during my work on vhost, but I think the patch makes sense generally. Pls comment or commit. Makefile.hw | 2 +- Makefile.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.hw b/Makefile.hw index f7a9507..6857fea 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -16,7 +16,7 @@ CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE CPPFLAGS+=-I$(SRC_PATH)/fpu obj-y = -obj-y += virtio.o virtio-pci.o +obj-y += virtio.o obj-y += fw_cfg.o obj-y += watchdog.o obj-y += nand.o ecc.o diff --git a/Makefile.target b/Makefile.target index df1f32b..0dd56b1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -538,7 +538,7 @@ obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ gdbstub.o gdbstub-xml.o msix.o ioport.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-console.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o LIBS+=-lz