From patchwork Thu Oct 26 09:19:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 10027883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 378776032C for ; Thu, 26 Oct 2017 09:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DF2428BB3 for ; Thu, 26 Oct 2017 09:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22E6128D71; Thu, 26 Oct 2017 09:21:54 +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=-4.2 required=2.0 tests=BAYES_00, 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 AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9309D28D70 for ; Thu, 26 Oct 2017 09:21:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e7eKO-00067P-W5; Thu, 26 Oct 2017 09:19:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e7eKN-000669-VA for xen-devel@lists.xenproject.org; Thu, 26 Oct 2017 09:19:52 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id AE/E8-18968-7B8A1F95; Thu, 26 Oct 2017 09:19:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsXitHSDve62FR8 jDfZ8F7X4vmUykwOjx+EPV1gCGKNYM/OS8isSWDNO7zrBXrDCtOLxlSnMDYx7NLsYOTkkBPwl Vi55wgJiswnoSFycu5Oti5GDQ0RAReL2XoMuRi4OZoFnTBIXpt5kBqkRFrCXWN90ixHEZhFQl bjwcA9YnFfAUmLuzSlgvRICehI/thuChDkFrCSWvW9jBbGFgEoWnl3LCFEuKHFyJsRaZgFNid btv9khbHmJ5q2zmSHqFSX65z1gm8DINwtJyywkLbOQtCxgZF7FqF6cWlSWWqRrqpdUlJmeUZK bmJmja2hgrJebWlycmJ6ak5hUrJecn7uJERho9QwMjDsYL391OsQoycGkJMrLsOdDpBBfUn5K ZUZicUZ8UWlOavEhRhkODiUJ3vzlHyOFBItS01Mr0jJzgCEPk5bg4FES4TUHSfMWFyTmFmemQ 6ROMRpzdNy8+4eJ49nM1w3MQix5+XmpUuK8LiClAiClGaV5cINgsXiJUVZKmJeRgYFBiKcgtS g3swRV/hWjOAejkjBvB8gUnsy8Erh9r4BOYQI6pUn1A8gpJYkIKakGxuraWy/cHsrl/Wk4u1a q3qj9kOxsY5XdIunnrhlbJxedVT8hdbT55C4hxlti20vXZFtJnXPcn6dl9SWv80KXr+LPdTZ7 vt1X/WjNU3thy38uLZUZi0SWZP1hmFZfrSx74133LuaZBQpm76L6BPNfygZ/kxK99UJt8W7H0 mnlutMkPvfu+n/KQomlOCPRUIu5qDgRAGJXtBPAAgAA X-Env-Sender: prvs=4659c6258=roger.pau@citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1509009586!111888965!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18408 invoked from network); 26 Oct 2017 09:19:49 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 26 Oct 2017 09:19:49 -0000 X-IronPort-AV: E=Sophos;i="5.43,434,1503360000"; d="scan'208";a="456161870" From: Roger Pau Monne To: Date: Thu, 26 Oct 2017 10:19:32 +0100 Message-ID: <20171026091938.59247-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.13.5 (Apple Git-94) In-Reply-To: <20171026091938.59247-1-roger.pau@citrix.com> References: <20171026091938.59247-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH for-next 3/9] gcov: rename sysctl and functions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change gcov to cov. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Andrew Cooper Cc: George Dunlap Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Tim Deegan --- tools/misc/xencov.c | 28 ++++++++++++++-------------- xen/common/coverage/gcov.c | 8 ++++---- xen/common/sysctl.c | 4 ++-- xen/include/public/sysctl.h | 12 ++++++------ xen/include/xen/coverage.h | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tools/misc/xencov.c b/tools/misc/xencov.c index 4130f425dc..5db00c37db 100644 --- a/tools/misc/xencov.c +++ b/tools/misc/xencov.c @@ -26,31 +26,31 @@ static xc_interface *xch = NULL; -int gcov_sysctl(int op, struct xen_sysctl *sysctl, - struct xc_hypercall_buffer *buf, uint32_t buf_size) +int cov_sysctl(int op, struct xen_sysctl *sysctl, + struct xc_hypercall_buffer *buf, uint32_t buf_size) { DECLARE_HYPERCALL_BUFFER_ARGUMENT(buf); memset(sysctl, 0, sizeof(*sysctl)); - sysctl->cmd = XEN_SYSCTL_gcov_op; + sysctl->cmd = XEN_SYSCTL_cov_op; - sysctl->u.gcov_op.cmd = op; - sysctl->u.gcov_op.size = buf_size; - set_xen_guest_handle(sysctl->u.gcov_op.buffer, buf); + sysctl->u.cov_op.cmd = op; + sysctl->u.cov_op.size = buf_size; + set_xen_guest_handle(sysctl->u.cov_op.buffer, buf); return xc_sysctl(xch, sysctl); } -static void gcov_read(const char *fn) +static void cov_read(const char *fn) { struct xen_sysctl sys; uint32_t total_len; DECLARE_HYPERCALL_BUFFER(uint8_t, p); FILE *f; - if (gcov_sysctl(XEN_SYSCTL_GCOV_get_size, &sys, NULL, 0) < 0) + if (cov_sysctl(XEN_SYSCTL_COV_get_size, &sys, NULL, 0) < 0) err(1, "getting total length"); - total_len = sys.u.gcov_op.size; + total_len = sys.u.cov_op.size; /* Shouldn't exceed a few hundred kilobytes */ if (total_len > 8u * 1024u * 1024u) @@ -61,7 +61,7 @@ static void gcov_read(const char *fn) err(1, "allocating buffer"); memset(p, 0, total_len); - if (gcov_sysctl(XEN_SYSCTL_GCOV_read, &sys, HYPERCALL_BUFFER(p), + if (cov_sysctl(XEN_SYSCTL_COV_read, &sys, HYPERCALL_BUFFER(p), total_len) < 0) err(1, "getting gcov data"); @@ -82,11 +82,11 @@ static void gcov_read(const char *fn) xc_hypercall_buffer_free(xch, p); } -static void gcov_reset(void) +static void cov_reset(void) { struct xen_sysctl sys; - if (gcov_sysctl(XEN_SYSCTL_GCOV_reset, &sys, NULL, 0) < 0) + if (cov_sysctl(XEN_SYSCTL_COV_reset, &sys, NULL, 0) < 0) err(1, "resetting gcov information"); } @@ -126,9 +126,9 @@ int main(int argc, char **argv) err(1, "opening xc interface"); if (strcmp(argv[0], "reset") == 0) - gcov_reset(); + cov_reset(); else if (strcmp(argv[0], "read") == 0) - gcov_read(argc > 1 ? argv[1] : "-"); + cov_read(argc > 1 ? argv[1] : "-"); else usage(1); diff --git a/xen/common/coverage/gcov.c b/xen/common/coverage/gcov.c index 35653fd8d8..b1735693be 100644 --- a/xen/common/coverage/gcov.c +++ b/xen/common/coverage/gcov.c @@ -209,18 +209,18 @@ static int gcov_dump_all(XEN_GUEST_HANDLE_PARAM(char) buffer, return ret; } -int sysctl_gcov_op(struct xen_sysctl_gcov_op *op) +int sysctl_cov_op(struct xen_sysctl_cov_op *op) { int ret; switch ( op->cmd ) { - case XEN_SYSCTL_GCOV_get_size: + case XEN_SYSCTL_COV_get_size: op->size = gcov_get_size(); ret = 0; break; - case XEN_SYSCTL_GCOV_read: + case XEN_SYSCTL_COV_read: { XEN_GUEST_HANDLE_PARAM(char) buf; uint32_t size = op->size; @@ -233,7 +233,7 @@ int sysctl_gcov_op(struct xen_sysctl_gcov_op *op) break; } - case XEN_SYSCTL_GCOV_reset: + case XEN_SYSCTL_COV_reset: gcov_reset_all_counters(); ret = 0; break; diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 56def766e6..da3e1246b1 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -397,8 +397,8 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) break; #ifdef CONFIG_GCOV - case XEN_SYSCTL_gcov_op: - ret = sysctl_gcov_op(&op->u.gcov_op); + case XEN_SYSCTL_cov_op: + ret = sysctl_cov_op(&op->u.cov_op); copyback = 1; break; #endif diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 6140f1a059..654b37cdce 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -646,11 +646,11 @@ struct xen_sysctl_scheduler_op { #define XEN_GCOV_FORMAT_MAGIC 0x58434f56 /* XCOV */ -#define XEN_SYSCTL_GCOV_get_size 0 /* Get total size of output data */ -#define XEN_SYSCTL_GCOV_read 1 /* Read output data */ -#define XEN_SYSCTL_GCOV_reset 2 /* Reset all counters */ +#define XEN_SYSCTL_COV_get_size 0 /* Get total size of output data */ +#define XEN_SYSCTL_COV_read 1 /* Read output data */ +#define XEN_SYSCTL_COV_reset 2 /* Reset all counters */ -struct xen_sysctl_gcov_op { +struct xen_sysctl_cov_op { uint32_t cmd; uint32_t size; /* IN/OUT: size of the buffer */ XEN_GUEST_HANDLE_64(char) buffer; /* OUT */ @@ -1065,7 +1065,7 @@ struct xen_sysctl { #define XEN_SYSCTL_numainfo 17 #define XEN_SYSCTL_cpupool_op 18 #define XEN_SYSCTL_scheduler_op 19 -#define XEN_SYSCTL_gcov_op 20 +#define XEN_SYSCTL_cov_op 20 #define XEN_SYSCTL_psr_cmt_op 21 #define XEN_SYSCTL_pcitopoinfo 22 #define XEN_SYSCTL_psr_cat_op 23 @@ -1095,7 +1095,7 @@ struct xen_sysctl { struct xen_sysctl_lockprof_op lockprof_op; struct xen_sysctl_cpupool_op cpupool_op; struct xen_sysctl_scheduler_op scheduler_op; - struct xen_sysctl_gcov_op gcov_op; + struct xen_sysctl_cov_op cov_op; struct xen_sysctl_psr_cmt_op psr_cmt_op; struct xen_sysctl_psr_cat_op psr_cat_op; struct xen_sysctl_tmem_op tmem_op; diff --git a/xen/include/xen/coverage.h b/xen/include/xen/coverage.h index ef22eafc1f..bdfd29d3bb 100644 --- a/xen/include/xen/coverage.h +++ b/xen/include/xen/coverage.h @@ -3,7 +3,7 @@ #ifdef CONFIG_GCOV #include -int sysctl_gcov_op(struct xen_sysctl_gcov_op *op); +int sysctl_cov_op(struct xen_sysctl_cov_op *op); #endif #endif /* _XEN_GCOV_H */