From patchwork Mon Sep 4 11:01:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9937027 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 92E5B6038C for ; Mon, 4 Sep 2017 11:22:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84B2F2877D for ; Mon, 4 Sep 2017 11:22:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7958E2879D; Mon, 4 Sep 2017 11:22:35 +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 0AF822877D for ; Mon, 4 Sep 2017 11:22:35 +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 1dopQ5-0007sJ-C2; Mon, 04 Sep 2017 11:19:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dopQ3-0007sD-M4 for xen-devel@lists.xenproject.org; Mon, 04 Sep 2017 11:19:55 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 6D/B7-02225-AD63DA95; Mon, 04 Sep 2017 11:19:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXS1tYhr3vLbG2 kwZup/Bbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bt41dYCg5rVzyc3czSwHhFqYuRk0NIoFLi 6/2FTCC2hACvxJFlM1ghbH+JQ7MmANlcQDUNjBKTJ50AK2ITUJd4/LUHzBYRUJK4t2oymM0sk CexqO0TC4gtLBAi0fb0JJjNIqAq8XjWGuYuRnYOXgEPiX3eEOPlJE4emwy2ildAUOLkzCdA1R xAU9Ql1s8TghgoL9G8dTbzBEa+WUiqZiFUzUJStYCReRWjRnFqUVlqka6RhV5SUWZ6RkluYma OrqGBsV5uanFxYnpqTmJSsV5yfu4mRmCY1TMwMO5gbD/hd4hRkoNJSZT3/uM1kUJ8SfkplRmJ xRnxRaU5qcWHGGU4OJQkeKNN10YKCRalpqdWpGXmAAMeJi3BwaMkwpsCkuYtLkjMLc5Mh0idY tTl2LB6/RcmIZa8/LxUKXHebyBFAiBFGaV5cCNg0XeJUVZKmJeRgYFBiKcgtSg3swRV/hWjOA ejkjDvUZApPJl5JXCbXgEdwQR0RNXLNSBHlCQipKQaGGWC7u95aqK06prplLOeTZ19zscFmNW k3kspLlRLmr2j4MKkswuV7aN/h0e5zFlRKKG35gy7UJ+j9t+Ks9dueLvtv3M8a1Pf667yvU85 n+8vWpST0X448c+60MaT58vixVkfTCgzT7c++2ZmrGDR5nKxM2+LHe61vpkQlOyun1+sdsK9f h4HqxJLcUaioRZzUXEiAJjtYfq5AgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1504523992!105396762!1 X-Originating-IP: [134.134.136.31] 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 45737 invoked from network); 4 Sep 2017 11:19:53 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-16.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Sep 2017 11:19:53 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP; 04 Sep 2017 04:19:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,474,1498546800"; d="scan'208";a="896905588" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by FMSMGA003.fm.intel.com with ESMTP; 04 Sep 2017 04:19:48 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Mon, 4 Sep 2017 19:01:43 +0800 Message-Id: <1504522904-41135-1-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: wei.liu2@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 1/2] tools: use '__i386__' and '__x86_64__' to replace PSR macros 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 The libxl interfaces and related functions are not necessary to be included by 'LIBXL_HAVE_PSR_CMT' and 'LIBXL_HAVE_PSR_CAT'. So replace them to common x86 macros. Furthermore, only compile 'xl_psr.c' under x86. Suggested-by: Roger Pau Monné Suggested-by: Wei Liu Signed-off-by: Yi Sun Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- - This patch is not tested to be compiled under ARM. v3: - replace PSR macros to '__i386__' and '__x86_64__'. (suggested by Wei Liu) - only compile 'xl_psr.c' under x86. (suggested by Roger Pau Monné) v2: - remove the macros in xl.h. (suggested by Roger Pau Monné) --- tools/libxl/libxl.h | 6 +----- tools/xl/Makefile | 5 +++-- tools/xl/xl.h | 4 +--- tools/xl/xl_cmdtable.c | 5 +---- tools/xl/xl_psr.c | 5 ----- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 229e289..6c087dd 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -2166,7 +2166,7 @@ bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id); void libxl_ms_vm_genid_copy(libxl_ctx *ctx, libxl_ms_vm_genid *dst, const libxl_ms_vm_genid *src); -#ifdef LIBXL_HAVE_PSR_CMT +#if defined(__i386__) || defined(__x86_64__) int libxl_psr_cmt_attach(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_detach(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_domain_attached(libxl_ctx *ctx, uint32_t domid); @@ -2179,9 +2179,7 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, uint32_t socketid, uint32_t *l3_cache_occupancy); -#endif -#ifdef LIBXL_HAVE_PSR_MBM int libxl_psr_cmt_type_supported(libxl_ctx *ctx, libxl_psr_cmt_type type); int libxl_psr_cmt_get_sample(libxl_ctx *ctx, uint32_t domid, @@ -2189,9 +2187,7 @@ int libxl_psr_cmt_get_sample(libxl_ctx *ctx, uint64_t scope, uint64_t *sample_r, uint64_t *tsc_r); -#endif -#ifdef LIBXL_HAVE_PSR_CAT /* * Function to set a domain's cbm. It operates on a single or multiple * target(s) defined in 'target_map'. The definition of 'target_map' is diff --git a/tools/xl/Makefile b/tools/xl/Makefile index c868899..ff85d48 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -15,11 +15,12 @@ LDFLAGS += $(PTHREAD_LDFLAGS) CFLAGS_XL += $(CFLAGS_libxenlight) CFLAGS_XL += -Wshadow -XL_OBJS = xl.o xl_cmdtable.o xl_sxp.o xl_utils.o +XL_OBJS-$(CONFIG_X86) = xl_psr.o +XL_OBJS = xl.o xl_cmdtable.o xl_sxp.o xl_utils.o $(XL_OBJS-y) XL_OBJS += xl_tmem.o xl_parse.o xl_cpupool.o xl_flask.o XL_OBJS += xl_vtpm.o xl_block.o xl_nic.o xl_usb.o XL_OBJS += xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o -XL_OBJS += xl_psr.o xl_info.o xl_console.o xl_misc.o +XL_OBJS += xl_info.o xl_console.o xl_misc.o XL_OBJS += xl_vmcontrol.o xl_saverestore.o xl_migrate.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index aa95b77..8d7b957 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -197,13 +197,11 @@ int main_loadpolicy(int argc, char **argv); int main_remus(int argc, char **argv); #endif int main_devd(int argc, char **argv); -#ifdef LIBXL_HAVE_PSR_CMT +#if defined(__i386__) || defined(__x86_64__) int main_psr_hwinfo(int argc, char **argv); int main_psr_cmt_attach(int argc, char **argv); int main_psr_cmt_detach(int argc, char **argv); int main_psr_cmt_show(int argc, char **argv); -#endif -#ifdef LIBXL_HAVE_PSR_CAT int main_psr_cat_cbm_set(int argc, char **argv); int main_psr_cat_show(int argc, char **argv); #endif diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 2c71a9f..6baaed2 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -517,7 +517,7 @@ struct cmd_spec cmd_table[] = { "-F Run in the foreground.\n" "-p, --pidfile [FILE] Write PID to pidfile when daemonizing.", }, -#ifdef LIBXL_HAVE_PSR_CMT +#if defined(__i386__) || defined(__x86_64__) { "psr-hwinfo", &main_psr_hwinfo, 0, 1, "Show hardware information for Platform Shared Resource", @@ -544,8 +544,6 @@ struct cmd_spec cmd_table[] = { "\"total-mem-bandwidth\": Show total memory bandwidth(KB/s)\n" "\"local-mem-bandwidth\": Show local memory bandwidth(KB/s)\n", }, -#endif -#ifdef LIBXL_HAVE_PSR_CAT { "psr-cat-set", &main_psr_cat_cbm_set, 0, 1, "Set cache capacity bitmasks(CBM) for a domain", @@ -561,7 +559,6 @@ struct cmd_spec cmd_table[] = { "[options] ", "-l Specify the cache level to process, otherwise L3 cache is processed\n" }, - #endif { "usbctrl-attach", &main_usbctrl_attach, 0, 1, diff --git a/tools/xl/xl_psr.c b/tools/xl/xl_psr.c index 7309d4f..544f6f0 100644 --- a/tools/xl/xl_psr.c +++ b/tools/xl/xl_psr.c @@ -25,7 +25,6 @@ #include "xl_utils.h" #include "xl_parse.h" -#ifdef LIBXL_HAVE_PSR_CMT static int psr_cmt_hwinfo(void) { int rc; @@ -292,9 +291,7 @@ int main_psr_cmt_show(int argc, char **argv) return ret; } -#endif -#if defined(LIBXL_HAVE_PSR_CAT) || defined(LIBXL_HAVE_PSR_L2_CAT) static int psr_l3_cat_hwinfo(void) { int rc, nr; @@ -626,8 +623,6 @@ int main_psr_hwinfo(int argc, char **argv) return ret; } -#endif - /* * Local variables: * mode: C