From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCHv2 1/3] qemu-kvm: move virtio-pci.o to near pci.o Date: Thu, 13 Aug 2009 11:50:47 +0300 Message-ID: <20090813085047.GB4726@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: avi@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Return-path: 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 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: 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 -- 1.6.2.5