From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91Y-0006Zf-AL for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91W-0005jz-RF for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91W-0005js-J4 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:58 -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 38A684E336 for ; Tue, 9 Aug 2016 15:32:58 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:48 +0100 Message-Id: <1470756748-18933-21-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 20/60] trace: switch crypto/ 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 crypto/ directory to include the crypto/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- crypto/Makefile.objs | 2 ++ crypto/secret.c | 2 +- crypto/tlscreds.c | 2 +- crypto/tlscredsanon.c | 2 +- crypto/tlscredsx509.c | 2 +- crypto/tlssession.c | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 53b2785..99e7c1f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -121,7 +121,7 @@ ivshmem-server-obj-y = contrib/ivshmem-server/ trace-events-subdirs = trace-events-y = trace-events trace-events-subdirs += util -trace-events-y += crypto/trace-events +trace-events-subdirs += crypto trace-events-subdirs += io trace-events-y += migration/trace-events trace-events-y += block/trace-events diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index a36d2d9..aa09450 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -26,6 +26,8 @@ crypto-obj-y += xts.o crypto-obj-y += block.o crypto-obj-y += block-qcow.o crypto-obj-y += block-luks.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o # Let the userspace emulators avoid linking gnutls/etc crypto-aes-obj-y = aes.o diff --git a/crypto/secret.c b/crypto/secret.c index 285ab7a..b936615 100644 --- a/crypto/secret.c +++ b/crypto/secret.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "qom/object_interfaces.h" #include "qemu/base64.h" -#include "trace.h" +#include "crypto/trace.h" static void diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index a896553..7e7f974 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "crypto/tlscredspriv.h" -#include "trace.h" +#include "crypto/trace.h" #define DH_BITS 2048 diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index 1464220..c94c09b 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -23,7 +23,7 @@ #include "crypto/tlscredspriv.h" #include "qapi/error.h" #include "qom/object_interfaces.h" -#include "trace.h" +#include "crypto/trace.h" #ifdef CONFIG_GNUTLS diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index 520d34d..35c728c 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -24,7 +24,7 @@ #include "crypto/secret.h" #include "qapi/error.h" #include "qom/object_interfaces.h" -#include "trace.h" +#include "crypto/trace.h" #ifdef CONFIG_GNUTLS diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 2de42c6..876df60 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -24,7 +24,7 @@ #include "crypto/tlscredsx509.h" #include "qapi/error.h" #include "qemu/acl.h" -#include "trace.h" +#include "crypto/trace.h" #ifdef CONFIG_GNUTLS -- 2.7.4