From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92A-0007Yy-RK for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX929-0005zK-7B for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX929-0005zE-1j for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:37 -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 A627BC03070C for ; Tue, 9 Aug 2016 15:33:36 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:21 +0100 Message-Id: <1470756748-18933-54-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 53/60] trace: switch target-i386/ 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 target-i386/ directory to include the target-i386/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- target-i386/Makefile.objs | 2 ++ target-i386/kvm.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 2f892ed..3fc6365 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -155,7 +155,7 @@ trace-events-subdirs += hw/alpha trace-events-subdirs += ui trace-events-subdirs += audio trace-events-subdirs += net -trace-events-y += target-i386/trace-events +trace-events-subdirs += target-i386 trace-events-y += target-sparc/trace-events trace-events-y += target-s390x/trace-events trace-events-y += target-ppc/trace-events diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs index b223d79..a73e6f3 100644 --- a/target-i386/Makefile.objs +++ b/target-i386/Makefile.objs @@ -5,3 +5,5 @@ obj-y += gdbstub.o obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o obj-$(CONFIG_KVM) += kvm.o hyperv.o obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0b2016a..d4a63e7 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -44,7 +44,7 @@ #include "hw/pci/msi.h" #include "migration/migration.h" #include "exec/memattrs.h" -#include "trace.h" +#include "target-i386/trace.h" //#define DEBUG_KVM -- 2.7.4