Am 28.04.2011 22:49, schrieb Anthony Liguori:
On 04/28/2011 03:02 PM, Stefan Weil wrote:
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<w...@mail.berlios.de>
---
Makefile.objs | 2 --
Makefile.target | 2 --
hw/9pfs/virtio-9p-debug.c | 5 +++--
hw/9pfs/virtio-9p-local.c | 3 ++-
hw/9pfs/virtio-9p-posix-acl.c | 2 +-
hw/9pfs/virtio-9p-xattr-user.c | 2 +-
hw/9pfs/virtio-9p-xattr.c | 2 +-
hw/9pfs/virtio-9p.c | 4 ++--
8 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 9d8851e..df8cc9c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -290,8 +290,6 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o
virtio-9p-posix-acl.o
hw-obj-$(CONFIG_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))
-$(addprefix 9pfs/, $(9pfs-nested-y)): CFLAGS += -I$(SRC_PATH)/hw/
Wouldn't it be more straight forward to just do QEMU_CFLAGS +=?
Regards,
Anthony Liguori
That would be the second best solution (in my opinion).
Its only advantage would be that it minimises the size of the patch
(which is not a good argument if the result has disadvantages).
Do you think that the lines which I removed in Makefile.* look pretty
and maintainable? I don't think so. The new include statements are
much cleaner. They are also in line with other QEMU code - try
git grep '"hw/'
to see it yourself.
Regards,
Stefan Weil
