qemu: move virtio-pci.o to near pci.o

Message ID 20090810193024.GA16815@redhat.com
State Superseded
Headers show

Commit Message

Michael S. Tsirkin Aug. 10, 2009, 7:30 p.m.
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 <mst@redhat.com>

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
 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