From patchwork Thu Aug 13 08:50:47 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: 41001 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 n7D8q9vd018318 for ; Thu, 13 Aug 2009 08:52:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753725AbZHMIwE (ORCPT ); Thu, 13 Aug 2009 04:52:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753727AbZHMIwD (ORCPT ); Thu, 13 Aug 2009 04:52:03 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40895 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753719AbZHMIwC (ORCPT ); Thu, 13 Aug 2009 04:52:02 -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 n7D8q2xV030161; Thu, 13 Aug 2009 04:52:02 -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 n7D8q1JP030261; Thu, 13 Aug 2009 04:52:01 -0400 Received: from redhat.com (vpn-10-33.str.redhat.com [10.32.10.33]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7D8pwaC025400; Thu, 13 Aug 2009 04:51:59 -0400 Date: Thu, 13 Aug 2009 11:50:47 +0300 From: "Michael S. Tsirkin" To: avi@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCHv2 1/3] qemu-kvm: move virtio-pci.o to near pci.o Message-ID: <20090813085047.GB4726@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 139412e..6472ec1 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -11,7 +11,7 @@ VPATH=$(SRC_PATH):$(SRC_PATH)/hw QEMU_CFLAGS+=-I.. -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 aeda3fe..f6d9708 100644 --- a/Makefile.target +++ b/Makefile.target @@ -170,7 +170,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 qemu-config.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