From patchwork Thu Apr 6 17:14:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9667955 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 6B64D6021C for ; Thu, 6 Apr 2017 17:17:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C4A228307 for ; Thu, 6 Apr 2017 17:17:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11280285B2; Thu, 6 Apr 2017 17:17:55 +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 6643628307 for ; Thu, 6 Apr 2017 17:17:54 +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 1cwAzf-0003Mc-UD; Thu, 06 Apr 2017 17:14:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwAze-0003KW-MU for xen-devel@lists.xenproject.org; Thu, 06 Apr 2017 17:14:46 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 2F/48-23854-58776E85; Thu, 06 Apr 2017 17:14:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDvW5r+bM Ig5eTZSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxXa16yFswzrDiz+DtTA+NXlS5GTg4JAX+J 5svTWEFsNgFliZ+dvWwgtoiAnkTTgeeMIDazQJ7E2dWLwGqEBYwldt04A1bDIqAisXh2H1gNr 4CFxJfOTmaImfISu9ougtVzClhKTGo9AhYXAqp5t/85G4StINEx/RgTRK+gxMmZT1ggdklIHH zxgnkCI+8sJKlZSFILGJlWMWoUpxaVpRbpGlroJRVlpmeU5CZm5ugaGhjr5aYWFyemp+YkJhX rJefnbmIEBk89AwPjDsbfpz0PMUpyMCmJ8ir4PIkQ4kvKT6nMSCzOiC8qzUktPsQow8GhJMEb WfYsQkiwKDU9tSItMwcYxjBpCQ4eJRHeOpA0b3FBYm5xZjpE6hSjLseV1o/vmYRY8vLzUqXEe YNAigRAijJK8+BGwGLqEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3jmlQFN4MvNK4Da9Aj qCCegIn1tPQY4oSURISTUwti3OP998M6n6cUfftnNCiptexrkxvVXdttZRU9H94NeT71xnL0g 6HC7zRYujdWJHbWSuy/kDWVc/yBnU+uYfvH7xbVOrYIePidjiZX4ulY//fbFYHcV8La1h1ZTG tamnT1p4bj0wS6Ll243n3nuiZslx8DfWZ2mt31W8+Uv/DJX0Q4+e3POboMRSnJFoqMVcVJwIA GjQsTSkAgAA X-Env-Sender: prvs=262b22d93=wei.liu2@citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1491498880!82951294!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14245 invoked from network); 6 Apr 2017 17:14:45 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 6 Apr 2017 17:14:45 -0000 X-IronPort-AV: E=Sophos;i="5.37,160,1488844800"; d="scan'208";a="426544826" From: Wei Liu To: Xen-devel Date: Thu, 6 Apr 2017 18:14:34 +0100 Message-ID: <20170406171434.15484-8-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170406171434.15484-1-wei.liu2@citrix.com> References: <20170406171434.15484-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH for-next 7/7] x86: clean up traps.c 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 Delete all trailing white spaces. Replace bool_t with bool. No functional change. Signed-off-by: Wei Liu Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 351bb950d8..4481615e2c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1,18 +1,18 @@ /****************************************************************************** * arch/x86/traps.c - * + * * Modifications to Linux original are copyright (c) 2002-2004, K A Fraser - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; If not, see . */ @@ -110,7 +110,7 @@ void (*ioemul_handle_quirk)( static int debug_stack_lines = 20; integer_param("debug_stack_lines", debug_stack_lines); -static bool_t opt_ler; +static bool opt_ler; boolean_param("ler", opt_ler); #define stack_words_per_line 4 @@ -525,7 +525,7 @@ void vcpu_show_execution_state(struct vcpu *v) } static cpumask_t show_state_mask; -static bool_t opt_show_all; +static bool opt_show_all; boolean_param("async-show-all", opt_show_all); static int nmi_show_execution_state(const struct cpu_user_regs *regs, int cpu) @@ -548,7 +548,7 @@ static int nmi_show_execution_state(const struct cpu_user_regs *regs, int cpu) * are disabled). In such situations we can't do much that is safe. We try to * print out some tracing and then we just spin. */ -void fatal_trap(const struct cpu_user_regs *regs, bool_t show_remote) +void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) { static DEFINE_PER_CPU(char, depth); unsigned int trapnr = regs->entry_vector; @@ -978,7 +978,7 @@ void do_int3(struct cpu_user_regs *regs) { debugger_trap_fatal(TRAP_int3, regs); return; - } + } pv_inject_guest_trap(TRAP_int3, regs); } @@ -1328,9 +1328,9 @@ void do_page_fault(struct cpu_user_regs *regs) /* * Early #PF handler to print CR2, error code, and stack. - * + * * We also deal with spurious faults here, even though they should never happen - * during early boot (an issue was seen once, but was most likely a hardware + * during early boot (an issue was seen once, but was most likely a hardware * problem). */ void __init do_early_page_fault(struct cpu_user_regs *regs) @@ -1374,7 +1374,7 @@ void do_general_protection(struct cpu_user_regs *regs) /* * Cunning trick to allow arbitrary "INT n" handling. - * + * * We set DPL == 0 on all vectors in the IDT. This prevents any INT * instruction from trapping to the appropriate vector, when that might not * be expected by Xen or the guest OS. For example, that entry might be for @@ -1382,12 +1382,12 @@ void do_general_protection(struct cpu_user_regs *regs) * expect an error code on the stack (which a software trap never * provides), or might be a hardware interrupt handler that doesn't like * being called spuriously. - * + * * Instead, a GPF occurs with the faulting IDT vector in the error code. - * Bit 1 is set to indicate that an IDT entry caused the fault. Bit 0 is + * Bit 1 is set to indicate that an IDT entry caused the fault. Bit 0 is * clear (which got already checked above) to indicate that it's a software * fault, not a hardware one. - * + * * NOTE: Vectors 3 and 4 are dealt with from their own handler. This is * okay because they can only be triggered by an explicit DPL-checked * instruction. The DPL specified by the guest OS for these vectors is NOT @@ -1586,14 +1586,14 @@ static int dummy_nmi_callback(const struct cpu_user_regs *regs, int cpu) { return 0; } - + static nmi_callback_t *nmi_callback = dummy_nmi_callback; void do_nmi(const struct cpu_user_regs *regs) { unsigned int cpu = smp_processor_id(); unsigned char reason; - bool_t handle_unknown = 0; + bool handle_unknown = false; ++nmi_count(cpu); @@ -1602,7 +1602,7 @@ void do_nmi(const struct cpu_user_regs *regs) if ( (nmi_watchdog == NMI_NONE) || (!nmi_watchdog_tick(regs) && watchdog_force) ) - handle_unknown = 1; + handle_unknown = true; /* Only the BSP gets external NMIs from the system. */ if ( cpu == 0 ) @@ -1982,28 +1982,28 @@ long set_debugreg(struct vcpu *v, unsigned int reg, unsigned long value) switch ( reg ) { - case 0: + case 0: if ( !access_ok(value, sizeof(long)) ) return -EPERM; - if ( v == curr ) + if ( v == curr ) write_debugreg(0, value); break; - case 1: + case 1: if ( !access_ok(value, sizeof(long)) ) return -EPERM; - if ( v == curr ) + if ( v == curr ) write_debugreg(1, value); break; - case 2: + case 2: if ( !access_ok(value, sizeof(long)) ) return -EPERM; - if ( v == curr ) + if ( v == curr ) write_debugreg(2, value); break; case 3: if ( !access_ok(value, sizeof(long)) ) return -EPERM; - if ( v == curr ) + if ( v == curr ) write_debugreg(3, value); break; case 6: @@ -2013,7 +2013,7 @@ long set_debugreg(struct vcpu *v, unsigned int reg, unsigned long value) */ value &= ~DR_STATUS_RESERVED_ZERO; /* reserved bits => 0 */ value |= DR_STATUS_RESERVED_ONE; /* reserved bits => 1 */ - if ( v == curr ) + if ( v == curr ) write_debugreg(6, value); break; case 7: