From patchwork Mon Aug 10 19:23:16 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: 40470 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7AJOYMV024876 for ; Mon, 10 Aug 2009 19:24:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbZHJTYb (ORCPT ); Mon, 10 Aug 2009 15:24:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751871AbZHJTYb (ORCPT ); Mon, 10 Aug 2009 15:24:31 -0400 Received: from mx2.redhat.com ([66.187.237.31]:51113 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751654AbZHJTYb (ORCPT ); Mon, 10 Aug 2009 15:24:31 -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 n7AJOV7v012514; Mon, 10 Aug 2009 15:24:31 -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 n7AJOT7H016310; Mon, 10 Aug 2009 15:24:29 -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 n7AJORBm001908; Mon, 10 Aug 2009 15:24:28 -0400 Date: Mon, 10 Aug 2009 22:23:16 +0300 From: "Michael S. Tsirkin" To: avi@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCH 1/3] qemu: move virtio-pci.o to near pci.o Message-ID: <20090810192316.GB16781@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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 --- 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