From patchwork Fri Feb 17 06:39:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9578873 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 5BB1460586 for ; Fri, 17 Feb 2017 06:43:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CD722869B for ; Fri, 17 Feb 2017 06:43:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41A6B286A7; Fri, 17 Feb 2017 06:43:15 +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 BFDEE286A1 for ; Fri, 17 Feb 2017 06:43:14 +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 1cecDe-0002LN-Uk; Fri, 17 Feb 2017 06:40:38 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cecDd-0002L8-Hh for xen-devel@lists.xen.org; Fri, 17 Feb 2017 06:40:37 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id 4F/EA-27678-4EA96A85; Fri, 17 Feb 2017 06:40:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsVywNykWPfJrGU RBgc+sFos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnzmx+xF1xSrzi44SVzA+Mt2S5GLg4hgWmM Er1f17N2MXJySAjwShxZNgPK9pNYcfgUI0RRL6PE9UkHwRJsAvoSKx5D2CIC0hLXPl8GK2IWO MsoseRuA1MXIweHsICPxLPdtSA1LAKqEsc6N7CB2LwCthK9U5vZIRbIS1y4eooFxOYUsJP48/ ADWFwIqOb9p3vMExh5FzAyrGJUL04tKkst0jXRSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCr WS87P3cQIDAcGINjB2H3Z/xCjJAeTkijvomnLIoT4kvJTKjMSizPii0pzUosPMcpwcChJ8HID w0tIsCg1PbUiLTMHGJgwaQkOHiURXg6QNG9xQWJucWY6ROoUo6KUOO+NmUAJAZBERmkeXBssG i4xykoJ8zICHSLEU5BalJtZgir/ilGcg1FJmPcCyBSezLwSuOmvgBYzAS3ujFgKsrgkESEl1c Doz/swZ9YHti2r2TgvqzV/nbBJYcN0phfWLIVsh8RZfrHctvaSWfNzr1DAb3XNdkPJk9kKvK5 TZI1uVylX2H25MOHntKSljOv+OAYeO9306qHiHDdHk7OvPnf9z+Y47nay9DDj8xnhx6XnLOoQ nOZwZVeDztpT9qy/tQVkDy2csTQlI//VvS06SizFGYmGWsxFxYkA9+V28YECAAA= X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1487313633!34675007!1 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31713 invoked from network); 17 Feb 2017 06:40:35 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Feb 2017 06:40:35 -0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Feb 2017 22:40:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,171,1484035200"; d="scan'208";a="65781474" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.133]) by orsmga005.jf.intel.com with ESMTP; 16 Feb 2017 22:40:31 -0800 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Fri, 17 Feb 2017 14:39:18 +0800 Message-Id: <20170217063936.13208-2-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170217063936.13208-1-haozhong.zhang@intel.com> References: <20170217063936.13208-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Christoph Egger , Andrew Cooper , Jan Beulich , Liu Jinsong Subject: [Xen-devel] [PATCH 01/19] x86/mce: fix indentation style in xen-mca.h and mce.h 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Replace tab indentation by whitespace. Signed-off-by: Haozhong Zhang Acked-by: Jan Beulich --- Cc: Christoph Egger Cc: Liu Jinsong Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.h | 40 +++++++++++++++++------------------ xen/include/public/arch-x86/xen-mca.h | 24 ++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index e83d431..2f0fb07 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -30,11 +30,11 @@ extern int mce_verbosity; } while (0) enum mcheck_type { - mcheck_unset = -1, - mcheck_none, - mcheck_amd_famXX, - mcheck_amd_k8, - mcheck_intel + mcheck_unset = -1, + mcheck_none, + mcheck_amd_famXX, + mcheck_amd_k8, + mcheck_intel }; extern uint8_t cmci_apic_vector; @@ -59,7 +59,7 @@ unsigned int mce_firstbank(struct cpuinfo_x86 *c); struct mc_info *x86_mcinfo_getptr(void); void noreturn mc_panic(char *s); void x86_mc_get_cpu_info(unsigned, uint32_t *, uint16_t *, uint16_t *, - uint32_t *, uint32_t *, uint32_t *, uint32_t *); + uint32_t *, uint32_t *, uint32_t *, uint32_t *); /* Register a handler for machine check exceptions. */ typedef void (*x86_mce_vector_t)(const struct cpu_user_regs *regs); @@ -80,10 +80,10 @@ extern bool_t intpose_inval(unsigned int, uint64_t); static inline uint64_t mca_rdmsr(unsigned int msr) { - uint64_t val; - if (intpose_lookup(smp_processor_id(), msr, &val) == NULL) - rdmsrl(msr, val); - return val; + uint64_t val; + if (intpose_lookup(smp_processor_id(), msr, &val) == NULL) + rdmsrl(msr, val); + return val; } /* Write an MSR, invalidating any interposed value */ @@ -101,19 +101,19 @@ static inline uint64_t mca_rdmsr(unsigned int msr) * of the MCA data observed in the logout operation. */ enum mca_source { - MCA_POLLER, - MCA_CMCI_HANDLER, - MCA_RESET, - MCA_MCE_SCAN + MCA_POLLER, + MCA_CMCI_HANDLER, + MCA_RESET, + MCA_MCE_SCAN }; struct mca_summary { - uint32_t errcnt; /* number of banks with valid errors */ - int ripv; /* meaningful on #MC */ - int eipv; /* meaningful on #MC */ - bool_t uc; /* UC flag */ - bool_t pcc; /* PCC flag */ - bool_t recoverable; /* software error recoverable flag */ + uint32_t errcnt; /* number of banks with valid errors */ + int ripv; /* meaningful on #MC */ + int eipv; /* meaningful on #MC */ + bool_t uc; /* UC flag */ + bool_t pcc; /* PCC flag */ + bool_t recoverable; /* software error recoverable flag */ }; DECLARE_PER_CPU(struct mca_banks *, poll_bankmask); diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index a97e821..9566a33 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -312,8 +312,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); struct mcinfo_common *_mic; \ \ found = 0; \ - (_ret) = NULL; \ - if (_mi == NULL) break; \ + (_ret) = NULL; \ + if (_mi == NULL) break; \ _mic = x86_mcinfo_first(_mi); \ for (i = 0; i < x86_mcinfo_nentries(_mi); i++) { \ if (_mic->type == (_type)) { \ @@ -345,8 +345,8 @@ struct xen_mc_fetch { /* IN/OUT variables. */ uint32_t flags; /* IN: XEN_MC_NONURGENT, XEN_MC_URGENT, XEN_MC_ACK if ack'ing an earlier fetch */ - /* OUT: XEN_MC_OK, XEN_MC_FETCHFAILED, - XEN_MC_NODATA, XEN_MC_NOMATCH */ + /* OUT: XEN_MC_OK, XEN_MC_FETCHFAILED, + XEN_MC_NODATA, XEN_MC_NOMATCH */ uint32_t _pad0; uint64_t fetch_id; /* OUT: id for ack, IN: id we are ack'ing */ @@ -378,11 +378,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_notifydomain_t); #define XEN_MC_physcpuinfo 3 struct xen_mc_physcpuinfo { - /* IN/OUT */ - uint32_t ncpus; - uint32_t _pad0; - /* OUT */ - XEN_GUEST_HANDLE(xen_mc_logical_cpu_t) info; + /* IN/OUT */ + uint32_t ncpus; + uint32_t _pad0; + /* OUT */ + XEN_GUEST_HANDLE(xen_mc_logical_cpu_t) info; }; #define XEN_MC_msrinject 4 @@ -404,7 +404,7 @@ struct xen_mc_msrinject { #define XEN_MC_mceinject 5 struct xen_mc_mceinject { - unsigned int mceinj_cpunr; /* target processor id */ + unsigned int mceinj_cpunr; /* target processor id */ }; #if defined(__XEN__) || defined(__XEN_TOOLS__) @@ -416,8 +416,8 @@ struct xen_mc_mceinject { #define XEN_MC_INJECT_CPU_BROADCAST 0x8 struct xen_mc_inject_v2 { - uint32_t flags; - struct xenctl_bitmap cpumap; + uint32_t flags; + struct xenctl_bitmap cpumap; }; #endif