Change gcov to cov (for internal interfaces) or coverage (for the public ones).
Signed-off-by: Roger Pau Monné <roger....@citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Acked-by: Ian Jackson <ian.jack...@eu.citrix.com> --- Cc: Ian Jackson <ian.jack...@eu.citrix.com> Cc: Wei Liu <wei.l...@citrix.com> Cc: Andrew Cooper <andrew.coop...@citrix.com> Cc: George Dunlap <george.dun...@eu.citrix.com> Cc: Jan Beulich <jbeul...@suse.com> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: Stefano Stabellini <sstabell...@kernel.org> Cc: Tim Deegan <t...@xen.org> --- Changes since v1: - Use coverage instead of cov in the public interface. --- 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..e5b40dba9c 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_coverage_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.coverage_op.cmd = op; + sysctl->u.coverage_op.size = buf_size; + set_xen_guest_handle(sysctl->u.coverage_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_COVERAGE_get_size, &sys, NULL, 0) < 0) err(1, "getting total length"); - total_len = sys.u.gcov_op.size; + total_len = sys.u.coverage_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_COVERAGE_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_COVERAGE_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 283d2eec86..798032cbbb 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_coverage_op *op) { int ret; switch ( op->cmd ) { - case XEN_SYSCTL_GCOV_get_size: + case XEN_SYSCTL_COVERAGE_get_size: op->size = gcov_get_size(); ret = 0; break; - case XEN_SYSCTL_GCOV_read: + case XEN_SYSCTL_COVERAGE_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_COVERAGE_reset: gcov_reset_all_counters(); ret = 0; break; diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 56def766e6..f2ae6295ff 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_coverage_op: + ret = sysctl_cov_op(&op->u.coverage_op); copyback = 1; break; #endif diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index f7f26c38e3..ef10368d79 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_COVERAGE_get_size 0 /* Get total size of output data */ +#define XEN_SYSCTL_COVERAGE_read 1 /* Read output data */ +#define XEN_SYSCTL_COVERAGE_reset 2 /* Reset all counters */ -struct xen_sysctl_gcov_op { +struct xen_sysctl_coverage_op { uint32_t cmd; uint32_t size; /* IN/OUT: size of the buffer */ XEN_GUEST_HANDLE_64(char) buffer; /* OUT */ @@ -1073,7 +1073,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_coverage_op 20 #define XEN_SYSCTL_psr_cmt_op 21 #define XEN_SYSCTL_pcitopoinfo 22 #define XEN_SYSCTL_psr_alloc 23 @@ -1103,7 +1103,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_coverage_op coverage_op; struct xen_sysctl_psr_cmt_op psr_cmt_op; struct xen_sysctl_psr_alloc psr_alloc; struct xen_sysctl_tmem_op tmem_op; diff --git a/xen/include/xen/coverage.h b/xen/include/xen/coverage.h index b34c304cba..daddef37d3 100644 --- a/xen/include/xen/coverage.h +++ b/xen/include/xen/coverage.h @@ -3,7 +3,7 @@ #ifdef CONFIG_GCOV #include <public/sysctl.h> -int sysctl_gcov_op(struct xen_sysctl_gcov_op *op); +int sysctl_cov_op(struct xen_sysctl_coverage_op *op); #endif #endif /* _XEN_GCOV_H */ -- 2.15.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel