From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX929-0007XS-GN for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX927-0005yr-QA for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX927-0005yf-KV for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:35 -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 EB26AC03070C for ; Tue, 9 Aug 2016 15:33:31 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:17 +0100 Message-Id: <1470756748-18933-50-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 49/60] trace: switch hw/alpha/ 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/alpha/ directory to include the hw/alpha/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/alpha/Makefile.objs | 2 ++ hw/alpha/pci.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index fbcf040..510083c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -151,7 +151,7 @@ trace-events-subdirs += hw/s390x trace-events-subdirs += hw/vfio trace-events-subdirs += hw/acpi trace-events-subdirs += hw/arm -trace-events-y += hw/alpha/trace-events +trace-events-subdirs += hw/alpha trace-events-y += ui/trace-events trace-events-y += audio/trace-events trace-events-y += net/trace-events diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index 5c74275..e8e0573 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1 +1,3 @@ obj-y += dp264.o pci.o typhoon.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c index 8dde637..3fafb1b 100644 --- a/hw/alpha/pci.c +++ b/hw/alpha/pci.c @@ -11,7 +11,7 @@ #include "alpha_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h" -#include "trace.h" +#include "hw/alpha/trace.h" /* Fallback for unassigned PCI I/O operations. Avoids MCHK. */ -- 2.7.4