From: Michael S. Tsirkin Date: Mon, 10 Aug 2009 19:30:24 +0000 (+0300) Subject: qemu: move virtio-pci.o to near pci.o X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3987e1cf6db2ce530e0b01ae120933b6cca28b90;p=qemu.git qemu: move virtio-pci.o to near pci.o 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 Signed-off-by: Anthony Liguori --- diff --git a/Makefile.hw b/Makefile.hw index 139412e3cc..6472ec1637 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 ed948409d1..690f30b251 100644 --- a/Makefile.target +++ b/Makefile.target @@ -152,7 +152,7 @@ obj-y = vl.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