From patchwork Thu Jul 18 14:00:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11049019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ECC416C5 for ; Thu, 18 Jul 2019 14:01:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCD9D23201 for ; Thu, 18 Jul 2019 14:01:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D15FD28613; Thu, 18 Jul 2019 14:01:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 79CE423201 for ; Thu, 18 Jul 2019 14:01:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ho6x9-0004G6-9s; Thu, 18 Jul 2019 14:00:11 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ho6x8-0004Fw-48 for xen-devel@lists.xenproject.org; Thu, 18 Jul 2019 14:00:10 +0000 X-Inumbo-ID: 5a463e77-a964-11e9-8980-bc764e045a96 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 5a463e77-a964-11e9-8980-bc764e045a96; Thu, 18 Jul 2019 14:00:09 +0000 (UTC) Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 3UVEs7ND/HtmkfrRhA1reiRHWRibUIWCVPjQ28wgKsuIv6GCx1r8MNbrecLcNCUe8uuXORl04s obPQnUS5x/9KK8l1f4sSauf4V7/VwcSU2IVynbQUkYPWZArQ6CI2OQVhEixq3PzOyhQxiJ1YRD wG4O4P0H/yNse7gL0m+fkMQM6YQT2jirdJD42ewTbCvq2vktJMEaEN9WcCVAtw4BTX4AHbdHvW QAnTFhShnY/X0I3WlvZw/I0QSy1JmRtDL+o96DnqiRtB1veMblMkKCnFeOhmOGdfLW8Avyqj9j +hE= X-SBRS: 2.7 X-MesageID: 3233417 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,278,1559534400"; d="scan'208";a="3233417" From: Andrew Cooper To: Xen-devel Date: Thu, 18 Jul 2019 15:00:05 +0100 Message-ID: <20190718140005.15975-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] xen/trace: Fix build with !CONFIG_TRACEBUFFER X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Julien Grall , Jan Beulich , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP GCC reports: In file included from hvm.c:24:0: /local/xen.git/xen/include/xen/trace.h: In function ‘tb_control’: /local/xen.git/xen/include/xen/trace.h:60:13: error: ‘ENOSYS’ undeclared (first use in this function) return -ENOSYS; ^~~~~~ Include xen/errno.h to resolve the issue. While tweaking this, add comments to the #else and #endif, as they are a fair distance apart. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: George Dunlap CC: Ian Jackson CC: Jan Beulich CC: Stefano Stabellini CC: Tim Deegan CC: Wei Liu CC: Julien Grall --- xen/include/xen/trace.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index fad92c784a..e6a4ef93cc 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -53,7 +53,10 @@ static inline void trace_var(u32 event, int cycles, int extra, void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args); -#else +#else /* CONFIG_TRACEBUFFER */ + +#include + static inline void init_trace_bufs(void) {} static inline int tb_control(struct xen_sysctl_tbuf_op *tbc) { @@ -71,7 +74,7 @@ static inline void __trace_var(uint32_t event, bool cycles, unsigned int extra, const void *extra_data) {} static inline void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) {} -#endif +#endif /* CONFIG_TRACEBUFFER */ /* Convenience macros for calling the trace function. */ #define TRACE_0D(_e) \