From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFZ1U-0004Hs-Sj for qemu-devel@nongnu.org; Thu, 28 Apr 2011 17:45:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFZ1T-0005Tj-R4 for qemu-devel@nongnu.org; Thu, 28 Apr 2011 17:45:20 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:61541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFZ1T-0005TT-Cz for qemu-devel@nongnu.org; Thu, 28 Apr 2011 17:45:19 -0400 Message-ID: <4DB9DFD5.8000504@mail.berlios.de> Date: Thu, 28 Apr 2011 23:44:53 +0200 From: Stefan Weil MIME-Version: 1.0 References: <1304020934-26995-1-git-send-email-weil@mail.berlios.de> <4DB9D2DC.3080201@codemonkey.ws> In-Reply-To: <4DB9D2DC.3080201@codemonkey.ws> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3] virtio-9p: Use relative includes for files in hw List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Anthony Liguori , QEMU Developers , blauwirbel@gmail.com, "Aneesh Kumar K.V" , Venkateswararao Jujjuri 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 >> --- >> 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