From f4f61d272e26ca34612c05070dfbda86dc00298b Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Wed, 1 Jun 2011 12:35:13 +0530 Subject: virtio-9p: Move device specific code to virtio-9p-device Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri (JV) --- Makefile.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index 602d50dc64..73ab0164f9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -194,7 +194,7 @@ obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o -obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o +obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o @@ -413,7 +413,7 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx qmp-commands.h: $(SRC_PATH)/qmp-commands.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") -9pfs/virtio-9p.o: CFLAGS += -I$(SRC_PATH)/hw/ +9pfs/virtio-9p-device.o: CFLAGS += -I$(SRC_PATH)/hw/ clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o -- cgit v1.2.3 From 873c32139354caef3cc1013f00963cc740a6a727 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 1 Jun 2011 12:35:14 +0530 Subject: virtio-9p: Use relative includes for files in hw Commit 353ac78d495ef976242abd868f68d78420861c2c moved the files without fixing the include paths. It used a modified CFLAGS to add hw to the include search path, but this breaks builds where the user wants to set special CFLAGS. Long include paths also increase compilation time. Therefore this patch removes the special CFLAGS for virtio and fixes the include statements by using relative include paths. v2: Remove special CFLAGS. v3: Update needed for latest QEMU. Signed-off-by: Stefan Weil Signed-off-by: Venkateswararao Jujjuri (JV) --- Makefile.target | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index 73ab0164f9..99ff3bae46 100644 --- a/Makefile.target +++ b/Makefile.target @@ -413,8 +413,6 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx qmp-commands.h: $(SRC_PATH)/qmp-commands.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") -9pfs/virtio-9p-device.o: CFLAGS += -I$(SRC_PATH)/hw/ - clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o -- cgit v1.2.3