From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chao Peng Subject: [PATCH v5 4/6] tools: correct coding style for psr Date: Wed, 21 Jan 2015 19:19:22 +0800 Message-ID: <1421839164-26037-5-git-send-email-chao.p.peng@linux.intel.com> References: <1421839164-26037-1-git-send-email-chao.p.peng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1421839164-26037-1-git-send-email-chao.p.peng@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: wei.liu2@citrix.com, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com, Ian.Jackson@eu.citrix.com, will.auld@intel.com, JBeulich@suse.com, keir@xen.org List-Id: xen-devel@lists.xenproject.org - space: remove space after '(' or before ')' in 'if' condition; - indention: align function definition/call arguments; Signed-off-by: Chao Peng Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 10 +++++----- tools/libxc/xc_psr.c | 10 +++++----- tools/libxl/libxl.h | 11 +++++++---- tools/libxl/libxl_psr.c | 11 +++++++---- tools/libxl/xl_cmdimpl.c | 11 ++++++----- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 96b357c..8a0eab6 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2693,15 +2693,15 @@ typedef enum xc_psr_cmt_type xc_psr_cmt_type; int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, - uint32_t *rmid); + uint32_t *rmid); int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid); int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, - uint32_t *upscaling_factor); + uint32_t *upscaling_factor); int xc_psr_cmt_get_l3_event_mask(xc_interface *xch, uint32_t *event_mask); int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, - uint32_t *l3_cache_size); -int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, - uint32_t cpu, uint32_t psr_cmt_type, uint64_t *monitor_data); + uint32_t *l3_cache_size); +int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, + uint32_t psr_cmt_type, uint64_t *monitor_data); int xc_psr_cmt_enabled(xc_interface *xch); #endif diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 2e9cbc2..368aeb0 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -47,7 +47,7 @@ int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid) } int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, - uint32_t *rmid) + uint32_t *rmid) { int rc; DECLARE_DOMCTL; @@ -88,7 +88,7 @@ int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid) } int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, - uint32_t *upscaling_factor) + uint32_t *upscaling_factor) { static int val = 0; int rc; @@ -130,7 +130,7 @@ int xc_psr_cmt_get_l3_event_mask(xc_interface *xch, uint32_t *event_mask) } int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, - uint32_t *l3_cache_size) + uint32_t *l3_cache_size) { static int val = 0; int rc; @@ -155,8 +155,8 @@ int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, return rc; } -int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, - uint32_t cpu, xc_psr_cmt_type type, uint64_t *monitor_data) +int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, + xc_psr_cmt_type type, uint64_t *monitor_data) { xc_resource_op_t op; xc_resource_entry_t entries[2]; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c9a64f9..596d2a0 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1454,11 +1454,14 @@ int libxl_psr_cmt_detach(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_domain_attached(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_enabled(libxl_ctx *ctx); int libxl_psr_cmt_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid); -int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, uint32_t socketid, - uint32_t *l3_cache_size); +int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, + uint32_t socketid, + uint32_t *l3_cache_size); int libxl_psr_cmt_get_l3_event_mask(libxl_ctx *ctx, uint32_t *event_mask); -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, - uint32_t socketid, uint32_t *l3_cache_occupancy); +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy); #endif /* misc */ diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 07f2aee..84819e6 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -135,8 +135,9 @@ int libxl_psr_cmt_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid) return rc; } -int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, uint32_t socketid, - uint32_t *l3_cache_size) +int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, + uint32_t socketid, + uint32_t *l3_cache_size) { GC_INIT(ctx); @@ -175,8 +176,10 @@ int libxl_psr_cmt_get_l3_event_mask(libxl_ctx *ctx, uint32_t *event_mask) return rc; } -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, - uint32_t socketid, uint32_t *l3_cache_occupancy) +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy) { GC_INIT(ctx); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0b02a6c..8fce979 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7808,7 +7808,7 @@ out: #ifdef LIBXL_HAVE_PSR_CMT static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, - uint32_t nr_sockets) + uint32_t nr_sockets) { char *domain_name; uint32_t socketid; @@ -7822,8 +7822,8 @@ static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, free(domain_name); for (socketid = 0; socketid < nr_sockets; socketid++) { - if ( !libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, - socketid, &l3_cache_occupancy) ) + if (!libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, socketid, + &l3_cache_occupancy)) printf("%13u KB", l3_cache_occupancy); } @@ -7871,8 +7871,9 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) for (socketid = 0; socketid < nr_sockets; socketid++) { rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size); if (rc < 0) { - fprintf(stderr, "Failed to get system l3 cache size for socket:%d\n", - socketid); + fprintf(stderr, + "Failed to get system l3 cache size for socket:%d\n", + socketid); return -1; } printf("%13u KB", l3_cache_size); -- 1.9.1