From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91t-0007GP-6Y for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91q-0005tM-RV for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43486) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91q-0005tE-MB for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:18 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4871B83F for ; Tue, 9 Aug 2016 15:33:18 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:05 +0100 Message-Id: <1470756748-18933-38-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 37/60] trace: switch hw/sparc/ directory to modular trace.h file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" Switch files in the hw/sparc/ directory to include the hw/sparc/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/sparc/Makefile.objs | 2 ++ hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index ce8d111..83e9506 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -139,7 +139,7 @@ trace-events-subdirs += hw/display trace-events-subdirs += hw/input trace-events-subdirs += hw/timer trace-events-subdirs += hw/dma -trace-events-y += hw/sparc/trace-events +trace-events-subdirs += hw/sparc trace-events-y += hw/sd/trace-events trace-events-y += hw/isa/trace-events trace-events-y += hw/mem/trace-events diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index c987b5b..f509dc7 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1 +1,3 @@ obj-y += sun4m.o leon3.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 6e16478..2cc29d4 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -34,7 +34,7 @@ #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" -#include "trace.h" +#include "hw/sparc/trace.h" #include "exec/address-spaces.h" #include "hw/sparc/grlib.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 478fda8..ac7228f 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -45,7 +45,7 @@ #include "hw/loader.h" #include "elf.h" #include "sysemu/block-backend.h" -#include "trace.h" +#include "hw/sparc/trace.h" #include "qemu/cutils.h" /* -- 2.7.4