From patchwork Sat Sep 30 01:39:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9979027 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 76ED96037F for ; Sat, 30 Sep 2017 02:01:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6564B298D1 for ; Sat, 30 Sep 2017 02:01:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A03F298CF; Sat, 30 Sep 2017 02:01:52 +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 B8B98298AA for ; Sat, 30 Sep 2017 02:01:51 +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 1dy741-0004e8-1D; Sat, 30 Sep 2017 01:59:33 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dy73z-0004XN-NB for xen-devel@lists.xenproject.org; Sat, 30 Sep 2017 01:59:31 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 00/BC-03454-38AFEC95; Sat, 30 Sep 2017 01:59:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRWlGSWpSXmKPExsXS1taRotv061y kwY9Zxhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bHVV9YC9aqVMx8cImtgfGQdBcjJ4eQQIXE sb2TmUBsCQFeiSPLZrBC2AESred+AsW5gGoaGCW+fl8DVsQmoC7x+GsPmC0ioCRxbxVEM7OAv 8TB/5fAbGEBL4mVL5Ywg9gsAqoS265dYQexeQU8JLb+3ckMsUBO4uSxyWDLOIHi13qa2CAOcp e40rKWEaJeUOLkzCcsXYwcQPPVJdbPE4JYJS/RvHU28wRGgVlIqmYhVM1CUrWAkXkVo3pxalF ZapGuoV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4mRmBgMgDBDsadz50OMUpyMCmJ 8i7/di5SiC8pP6UyI7E4I76oNCe1+BCjDAeHkgSv8E+gnGBRanpqRVpmDjBGYNISHDxKIry2I Gne4oLE3OLMdIjUKUZdjo6bd/8wCbHk5eelSonzFoAUCYAUZZTmwY2AxeslRlkpYV5GoKOEeA pSi3IzS1DlXzGKczAqCfOygUzhycwrgdv0CugIJqAjJk88A3JESSJCSqqBkW8JB1tb5ZRLb9J vKbmeEtv27+/3Yxq7vkbqt9xYeuLgVu6Fn2RNjr9pWr/iVnT4nywfbt0lF53CNytc7c3Yl7NR MO6dzwyOdKUTqgtc/e2+HNn7/unHjoe9GyRtT96Qli6/7vCEp9OWPXyh0OYrvyyfs9189uBeT MiE/ScqJadc3JzWf64zcoESS3FGoqEWc1FxIgCtSQwE0gIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1506736764!79487342!4 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58953 invoked from network); 30 Sep 2017 01:59:30 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Sep 2017 01:59:30 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 29 Sep 2017 18:59:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,455,1500966000"; d="scan'208"; a="1020039108" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga003.jf.intel.com with ESMTP; 29 Sep 2017 18:59:29 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sat, 30 Sep 2017 09:39:23 +0800 Message-Id: <1506735566-5706-14-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506735566-5706-1-git-send-email-yi.y.sun@linux.intel.com> References: <1506735566-5706-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: Ian Jackson , Yi Sun Subject: [Xen-devel] [PATCH v5 13/16] tools: rename 'xc_psr_cat_type' to 'xc_psr_type' 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 This patch renames 'xc_psr_cat_type' to 'xc_psr_type' so that the structure name is common for all allocation features. Signed-off-by: Yi Sun Acked-by: Wei Liu Reviewed-by: Chao Peng Reviewed-by: Roger Pau Monné --- CC: Ian Jackson v5: - remove a duplicated ';'. (suggested by Roger Pau Monné) v4: - move assignment of xc_type to its declaration place. (suggested by Roger Pau Monné) v3: - change 'xc_psr_val_type' to 'xc_psr_type'. (suggested by Roger Pau Monné) --- tools/libxc/include/xenctrl.h | 8 ++++---- tools/libxc/xc_psr.c | 4 ++-- tools/libxl/libxl_psr.c | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 043c2bb..1953950 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2451,13 +2451,13 @@ enum xc_psr_cmt_type { }; typedef enum xc_psr_cmt_type xc_psr_cmt_type; -enum xc_psr_cat_type { +enum xc_psr_type { XC_PSR_CAT_L3_CBM = 1, XC_PSR_CAT_L3_CBM_CODE = 2, XC_PSR_CAT_L3_CBM_DATA = 3, XC_PSR_CAT_L2_CBM = 4, }; -typedef enum xc_psr_cat_type xc_psr_cat_type; +typedef enum xc_psr_type xc_psr_type; enum xc_psr_feat_type { XC_PSR_CAT_L3, @@ -2497,10 +2497,10 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, int xc_psr_cmt_enabled(xc_interface *xch); int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_cat_type type, uint32_t target, + xc_psr_type type, uint32_t target, uint64_t data); int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_cat_type type, uint32_t target, + xc_psr_type type, uint32_t target, uint64_t *data); int xc_psr_get_hw_info(xc_interface *xch, uint32_t socket, xc_psr_feat_type type, xc_psr_hw_info *hw_info); diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 6b84d45..7d994e9 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -249,7 +249,7 @@ int xc_psr_cmt_enabled(xc_interface *xch) return 0; } int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_cat_type type, uint32_t target, + xc_psr_type type, uint32_t target, uint64_t data) { DECLARE_DOMCTL; @@ -284,7 +284,7 @@ int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, } int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_cat_type type, uint32_t target, + xc_psr_type type, uint32_t target, uint64_t *data) { int rc; diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index cd82ac0..6c87105 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -303,11 +303,11 @@ out: return rc; } -static inline xc_psr_cat_type libxl__psr_cbm_type_to_libxc_psr_cat_type( +static inline xc_psr_type libxl__psr_cbm_type_to_libxc_psr_type( libxl_psr_cbm_type type) { - BUILD_BUG_ON(sizeof(libxl_psr_cbm_type) != sizeof(xc_psr_cat_type)); - return (xc_psr_cat_type)type; + BUILD_BUG_ON(sizeof(libxl_psr_cbm_type) != sizeof(xc_psr_type)); + return (xc_psr_type)type; } int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, @@ -325,12 +325,11 @@ int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, } libxl_for_each_set_bit(socketid, *target_map) { - xc_psr_cat_type xc_type; + xc_psr_type xc_type = libxl__psr_cbm_type_to_libxc_psr_type(type); if (socketid >= nr_sockets) break; - xc_type = libxl__psr_cbm_type_to_libxc_psr_cat_type(type); if (xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, socketid, cbm)) { libxl__psr_cat_log_err_msg(gc, errno); @@ -349,7 +348,7 @@ int libxl_psr_cat_get_cbm(libxl_ctx *ctx, uint32_t domid, { GC_INIT(ctx); int rc = 0; - xc_psr_cat_type xc_type = libxl__psr_cbm_type_to_libxc_psr_cat_type(type); + xc_psr_type xc_type = libxl__psr_cbm_type_to_libxc_psr_type(type); if (xc_psr_cat_get_domain_data(ctx->xch, domid, xc_type, target, cbm_r)) {