From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFY9Z-000442-H4 for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:49:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFY9Y-0005Jj-8U for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:49:37 -0400 Received: from mail-yi0-f45.google.com ([209.85.218.45]:41657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFY9Y-0005Je-3f for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:49:36 -0400 Received: by yib19 with SMTP id 19so1346615yib.4 for ; Thu, 28 Apr 2011 13:49:35 -0700 (PDT) Message-ID: <4DB9D2DC.3080201@codemonkey.ws> Date: Thu, 28 Apr 2011 15:49:32 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1304020934-26995-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1304020934-26995-1-git-send-email-weil@mail.berlios.de> 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: Stefan Weil Cc: blauwirbel@gmail.com, Anthony Liguori , Venkateswararao Jujjuri , QEMU Developers , "Aneesh Kumar K.V" 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 > - > > ###################################################################### > # libdis > diff --git a/Makefile.target b/Makefile.target > index 2501c63..76bbdc7 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -401,8 +401,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.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 > diff --git a/hw/9pfs/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c > index 6b18842..4636ad5 100644 > --- a/hw/9pfs/virtio-9p-debug.c > +++ b/hw/9pfs/virtio-9p-debug.c > @@ -10,8 +10,9 @@ > * the COPYING file in the top-level directory. > * > */ > -#include "virtio.h" > -#include "pc.h" > + > +#include "hw/virtio.h" > +#include "hw/pc.h" > #include "virtio-9p.h" > #include "virtio-9p-debug.h" > > diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c > index 0a015de..3effc39 100644 > --- a/hw/9pfs/virtio-9p-local.c > +++ b/hw/9pfs/virtio-9p-local.c > @@ -10,7 +10,8 @@ > * the COPYING file in the top-level directory. > * > */ > -#include "virtio.h" > + > +#include "hw/virtio.h" > #include "virtio-9p.h" > #include "virtio-9p-xattr.h" > #include > diff --git a/hw/9pfs/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c > index 575abe8..c0ae9d6 100644 > --- a/hw/9pfs/virtio-9p-posix-acl.c > +++ b/hw/9pfs/virtio-9p-posix-acl.c > @@ -13,7 +13,7 @@ > > #include > #include > -#include "virtio.h" > +#include "hw/virtio.h" > #include "virtio-9p.h" > #include "fsdev/file-op-9p.h" > #include "virtio-9p-xattr.h" > diff --git a/hw/9pfs/virtio-9p-xattr-user.c b/hw/9pfs/virtio-9p-xattr-user.c > index bba13ce..c56039c 100644 > --- a/hw/9pfs/virtio-9p-xattr-user.c > +++ b/hw/9pfs/virtio-9p-xattr-user.c > @@ -12,7 +12,7 @@ > */ > > #include > -#include "virtio.h" > +#include "hw/virtio.h" > #include "virtio-9p.h" > #include "fsdev/file-op-9p.h" > #include "virtio-9p-xattr.h" > diff --git a/hw/9pfs/virtio-9p-xattr.c b/hw/9pfs/virtio-9p-xattr.c > index 03c3d3f..f08ce6e 100644 > --- a/hw/9pfs/virtio-9p-xattr.c > +++ b/hw/9pfs/virtio-9p-xattr.c > @@ -11,7 +11,7 @@ > * > */ > > -#include "virtio.h" > +#include "hw/virtio.h" > #include "virtio-9p.h" > #include "fsdev/file-op-9p.h" > #include "virtio-9p-xattr.h" > diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c > index b5fc52b..ac5a1d0 100644 > --- a/hw/9pfs/virtio-9p.c > +++ b/hw/9pfs/virtio-9p.c > @@ -11,8 +11,8 @@ > * > */ > > -#include "virtio.h" > -#include "pc.h" > +#include "hw/virtio.h" > +#include "hw/pc.h" > #include "qemu_socket.h" > #include "virtio-9p.h" > #include "fsdev/qemu-fsdev.h"