From patchwork Wed Jul 6 15:55:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 9216583 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 35EA160752 for ; Wed, 6 Jul 2016 15:57:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 254872705B for ; Wed, 6 Jul 2016 15:57:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1680F27165; Wed, 6 Jul 2016 15:57:58 +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 4A02B2705B for ; Wed, 6 Jul 2016 15:57:57 +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 1bKpAs-0002LY-Dp; Wed, 06 Jul 2016 15:55:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKpAr-0002KN-B4 for xen-devel@lists.xen.org; Wed, 06 Jul 2016 15:55:41 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 24/B7-09524-CF92D775; Wed, 06 Jul 2016 15:55:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRWlGSWpSXmKPExsUSfTxjoe5vzdp wg0/N1hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aRkzPYClZ4V3xp6mRuYGy062Lk5BAScJNY 8/I2excjF5C9hlGidcdkFgjnJKPEvC9v2CGq3CVO7vrJCJFYxSixeO9ZZpAEm4C2xLlD95hAb BEBaYlrny+DFTELHGWSmNH+gQUkISwQIHFszQNWEJtFQFWiedkRMJtXwFXi95rlQIM4OCQE5C QWXEgHMTmBTrrzuBpir6vEooUXwVZJCORIbD31gBGiWkrif6sSyCYJgaUsEpOOHGaCqJGReDT xJtsERqEFjAyrGDWKU4vKUot0jQz0kooy0zNKchMzc3QNDU30clOLixPTU3MSk4r1kvNzNzEC A7GegYFxB2PnZb9DjJIcTEqivCzfqsOF+JLyUyozEosz4otKc1KLDzHKcHAoSfAaAwNbSLAoN T21Ii0zBxgTMGkJDh4lEd4QDaA0b3FBYm5xZjpE6hSjLsexuTfWMgmx5OXnpUqJ834DKRIAKc oozYMbAYvPS4yyUsK8jAwMDEI8BalFuZklqPKvGMU5GJWEee1ApvBk5pXAbXoFdAQT0BE/Xap BjihJREhJNTBOEWU7HR8m7NvetfmXqJbQNUsVIeVLf+L2u522iM097Fa9TWjX0Y7arWyrl0zy VfHuyQr6azPr6O6nTgu9PQsWLtNmlc36d9NAcnKyyaZdQjzhcppffTxrLOcc5HIzuxLyamnIB JHJ4mszHgvPCL/CKxoSNreCXUslpP5VmeUt8VcpbAItD5VYijMSDbWYi4oTAR6VFqHKAgAA X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1467820539!47570384!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42497 invoked from network); 6 Jul 2016 15:55:39 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-7.tower-27.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 6 Jul 2016 15:55:39 -0000 Received: (qmail 3581 invoked from network); 6 Jul 2016 18:55:38 +0300 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.bbu.dsd.mx.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2016 18:55:38 +0300 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id C80C57FC02 for ; Wed, 6 Jul 2016 18:55:38 +0300 (EEST) Received: (qmail 22331 invoked from network); 6 Jul 2016 18:55:38 +0300 Received: from unknown (HELO czuzu-dev-vm.clj.bitdefender.biz) (czuzu@bitdefender.com@91.199.104.243) by smtp03.buh.bitdefender.org with SMTP; 6 Jul 2016 18:55:38 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 6 Jul 2016 18:55:22 +0300 Message-Id: <1467820522-13593-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1467820154-13256-1-git-send-email-czuzu@bitdefender.com> References: <1467820154-13256-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp03.buh.bitdefender.org, sigver: 7.66204 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.911, Dats: 425554, Stamp: 3], Multi: [Enabled, t: (0.000011, 0.011474)], BW: [Enabled, t: (0.000006,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.006960), Flags: BB9BAF5C; NN_TP_TAG_HTTP; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.011997)], URL: [Enabled, t: (0.000020)], RTDA: [Enabled, t: (0.015792), Hit: No, Details: v2.3.10; Id: 2m1ghhh.1amv7hmgm.34m5], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Kevin Tian , Stefano Stabellini , Jan Beulich , Razvan Cojocaru , Andrew Cooper , Julien Grall , Tamas K Lengyel , Jun Nakajima Subject: [Xen-devel] [PATCH v3 7/8] minor fixes (formatting, comments, unused includes etc.) 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 Minor fixes: - remove some empty lines - remove some unused includes - multi-line comment fixes - 80-columns formatting fixes Signed-off-by: Corneliu ZUZU Acked-by: Razvan Cojocaru Acked-by: Julien Grall --- Changed since v2: --- xen/arch/arm/domain.c | 1 - xen/arch/arm/traps.c | 1 - xen/arch/x86/hvm/hvm.c | 3 --- xen/arch/x86/hvm/vmx/vmx.c | 1 - xen/arch/x86/monitor.c | 1 - xen/arch/x86/vm_event.c | 3 --- xen/common/monitor.c | 1 - xen/common/vm_event.c | 6 ++++-- xen/include/asm-arm/vm_event.h | 9 +++------ xen/include/asm-x86/hvm/monitor.h | 1 - xen/include/asm-x86/monitor.h | 3 --- xen/include/asm-x86/vm_event.h | 1 - xen/include/public/vm_event.h | 38 +++++++++++++++++++------------------- xen/include/xen/vm_event.h | 1 - 14 files changed, 26 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 6ce4645..61fc08e 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -294,7 +294,6 @@ static void continue_new_vcpu(struct vcpu *prev) else /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu64); - } void context_switch(struct vcpu *prev, struct vcpu *next) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 44926ca..fb01703 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -439,7 +439,6 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, far |= addr << 32; WRITE_SYSREG(far, FAR_EL1); WRITE_SYSREG(fsr, IFSR32_EL2); - #endif } else diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 091cabe..32d2d5e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -63,11 +62,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0fa3fea..ee108b5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c index 4d4db33..8423931 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/arch/x86/monitor.c @@ -21,7 +21,6 @@ #include #include -#include #include static inline void write_ctrlreg_adjust_traps(struct domain *d, uint8_t index) diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index e37d6d3..2b1abe2 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -18,9 +18,6 @@ * License along with this program; If not, see . */ -#include -#include -#include #include /* Implicitly serialized by the domctl lock. */ diff --git a/xen/common/monitor.c b/xen/common/monitor.c index 436214a..08d1d98 100644 --- a/xen/common/monitor.c +++ b/xen/common/monitor.c @@ -23,7 +23,6 @@ #include #include #include -#include #include int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 40a7e56..93747eb 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -782,8 +782,10 @@ void vm_event_vcpu_unpause(struct vcpu *v) { int old, new, prev = v->vm_event_pause_count.counter; - /* All unpause requests as a result of toolstack responses. Prevent - * underflow of the vcpu pause count. */ + /* + * All unpause requests as a result of toolstack responses. + * Prevent underflow of the vcpu pause count. + */ do { old = prev; diff --git a/xen/include/asm-arm/vm_event.h b/xen/include/asm-arm/vm_event.h index a3fc4ce..ccc4b60 100644 --- a/xen/include/asm-arm/vm_event.h +++ b/xen/include/asm-arm/vm_event.h @@ -23,21 +23,18 @@ #include #include -static inline -int vm_event_init_domain(struct domain *d) +static inline int vm_event_init_domain(struct domain *d) { /* Nothing to do. */ return 0; } -static inline -void vm_event_cleanup_domain(struct domain *d) +static inline void vm_event_cleanup_domain(struct domain *d) { memset(&d->monitor, 0, sizeof(d->monitor)); } -static inline -void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v) +static inline void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v) { /* Not supported on ARM. */ } diff --git a/xen/include/asm-x86/hvm/monitor.h b/xen/include/asm-x86/hvm/monitor.h index 8b0f119..8d4ef19 100644 --- a/xen/include/asm-x86/hvm/monitor.h +++ b/xen/include/asm-x86/hvm/monitor.h @@ -19,7 +19,6 @@ #ifndef __ASM_X86_HVM_MONITOR_H__ #define __ASM_X86_HVM_MONITOR_H__ -#include #include #include diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h index 2213124..cf68512 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/asm-x86/monitor.h @@ -23,9 +23,6 @@ #define __ASM_X86_MONITOR_H__ #include -#include -#include -#include #include #define monitor_ctrlreg_bitmask(ctrlreg_index) (1U << (ctrlreg_index)) diff --git a/xen/include/asm-x86/vm_event.h b/xen/include/asm-x86/vm_event.h index 9bdeccc..0264686 100644 --- a/xen/include/asm-x86/vm_event.h +++ b/xen/include/asm-x86/vm_event.h @@ -20,7 +20,6 @@ #define __ASM_X86_VM_EVENT_H__ #include -#include /* * Should we emulate the next matching instruction on VCPU resume diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index 7bfe6cc..8c29968 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -74,20 +74,20 @@ * VM_EVENT_FLAG_SET_EMUL_READ_DATA are set, only the latter will be honored). */ #define VM_EVENT_FLAG_SET_EMUL_READ_DATA (1 << 5) - /* - * Deny completion of the operation that triggered the event. - * Currently only useful for MSR, CR0, CR3 and CR4 write events. - * Requires the vCPU to be paused already (synchronous events only). - */ +/* + * Deny completion of the operation that triggered the event. + * Currently only useful for MSR and control-register write events. + * Requires the vCPU to be paused already (synchronous events only). + */ #define VM_EVENT_FLAG_DENY (1 << 6) /* * This flag can be set in a request or a response * - * On a request, indicates that the event occurred in the alternate p2m specified by - * the altp2m_idx request field. + * On a request, indicates that the event occurred in the alternate p2m + * specified by the altp2m_idx request field. * - * On a response, indicates that the VCPU should resume in the alternate p2m specified - * by the altp2m_idx response field if possible. + * On a response, indicates that the VCPU should resume in the alternate p2m + * specified by the altp2m_idx response field if possible. */ #define VM_EVENT_FLAG_ALTERNATE_P2M (1 << 7) /* @@ -180,16 +180,16 @@ struct vm_event_regs_x86 { * FAULT_WITH_GLA: If the violation was triggered by accessing gla * FAULT_IN_GPT: If the violation was triggered during translating gla */ -#define MEM_ACCESS_R (1 << 0) -#define MEM_ACCESS_W (1 << 1) -#define MEM_ACCESS_X (1 << 2) -#define MEM_ACCESS_RWX (MEM_ACCESS_R | MEM_ACCESS_W | MEM_ACCESS_X) -#define MEM_ACCESS_RW (MEM_ACCESS_R | MEM_ACCESS_W) -#define MEM_ACCESS_RX (MEM_ACCESS_R | MEM_ACCESS_X) -#define MEM_ACCESS_WX (MEM_ACCESS_W | MEM_ACCESS_X) -#define MEM_ACCESS_GLA_VALID (1 << 3) -#define MEM_ACCESS_FAULT_WITH_GLA (1 << 4) -#define MEM_ACCESS_FAULT_IN_GPT (1 << 5) +#define MEM_ACCESS_R (1 << 0) +#define MEM_ACCESS_W (1 << 1) +#define MEM_ACCESS_X (1 << 2) +#define MEM_ACCESS_RWX (MEM_ACCESS_R | MEM_ACCESS_W | MEM_ACCESS_X) +#define MEM_ACCESS_RW (MEM_ACCESS_R | MEM_ACCESS_W) +#define MEM_ACCESS_RX (MEM_ACCESS_R | MEM_ACCESS_X) +#define MEM_ACCESS_WX (MEM_ACCESS_W | MEM_ACCESS_X) +#define MEM_ACCESS_GLA_VALID (1 << 3) +#define MEM_ACCESS_FAULT_WITH_GLA (1 << 4) +#define MEM_ACCESS_FAULT_IN_GPT (1 << 5) struct vm_event_mem_access { uint64_t gfn; diff --git a/xen/include/xen/vm_event.h b/xen/include/xen/vm_event.h index 89e6243..2074090 100644 --- a/xen/include/xen/vm_event.h +++ b/xen/include/xen/vm_event.h @@ -83,7 +83,6 @@ int vm_event_monitor_traps(struct vcpu *v, uint8_t sync, #endif /* __VM_EVENT_H__ */ - /* * Local variables: * mode: C