From patchwork Mon Aug 17 12:37:08 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: 42021 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 n7HCd1dM016662 for ; Mon, 17 Aug 2009 12:39:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752409AbZHQMi5 (ORCPT ); Mon, 17 Aug 2009 08:38:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752699AbZHQMi5 (ORCPT ); Mon, 17 Aug 2009 08:38:57 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55650 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752399AbZHQMi5 (ORCPT ); Mon, 17 Aug 2009 08:38:57 -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 n7HCcRqt009837; Mon, 17 Aug 2009 08:38:27 -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 n7HCcQ2U004361; Mon, 17 Aug 2009 08:38:26 -0400 Received: from redhat.com (vpn-6-31.tlv.redhat.com [10.35.6.31]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7HCcOhX018616; Mon, 17 Aug 2009 08:38:24 -0400 Date: Mon, 17 Aug 2009 15:37:08 +0300 From: "Michael S. Tsirkin" To: avi@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCHv3 1/4] qemu-kvm: move virtio-pci.o to near pci.o Message-ID: <20090817123708.GB10700@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