From patchwork Thu Apr 28 20:02:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 93287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 907C6100808 for ; Fri, 29 Apr 2011 06:02:39 +1000 (EST) Received: from localhost ([::1]:42684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFXQ3-0004fx-Pk for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2011 16:02:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFXPw-0004fg-2I for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFXPu-0007VK-Sc for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:02:28 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:56090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFXPu-0007VC-FL for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:02:26 -0400 Received: from flocke.fritz.box (p5086FD13.dip.t-dialin.net [80.134.253.19]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LpRkv-1PcdhP08hB-00ep2l; Thu, 28 Apr 2011 22:02:19 +0200 Received: from stefan by flocke.fritz.box with local (Exim 4.72) (envelope-from ) id 1QFXPk-00071w-LN; Thu, 28 Apr 2011 22:02:16 +0200 From: Stefan Weil To: QEMU Developers Date: Thu, 28 Apr 2011 22:02:14 +0200 Message-Id: <1304020934-26995-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-Provags-ID: V02:K0:D9P/ehq2YI1vlaQTVzMmZog11AZkaGVlpb17HUM9E9d TuEKQFFE59dD3o3RqX6J/0dDSxIcAYdXsaTB+aKiQRIl0FO3R/ x/wbsG1hYrUzyrIV4Lq8TxFfAcEQQvgNfPocyjI6gEoy0BqzTZ heC5S3PtpCZGrLa3xeDmuKGtpWlicO3rtoljioRtJNz6cnZWMj H2batDH5i93uqq5s8ypwFK57PXdSqEbMai+JJyEuU6B+qj96QT o2Sh53pBe/Epd X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.17.8 Cc: blauwirbel@gmail.com, Anthony Liguori , Venkateswararao Jujjuri , "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH v3] virtio-9p: Use relative includes for files in hw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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/ - ###################################################################### # 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"