x86/svm: Misc coding style corrections
PATCH 1/1 x86/svm: Misc coding style corrections
No functional change.
Signed-off-by Andrew Cooper <[email protected]>
---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
These almost certainly aren't all the style issues, but the end result is certainly far more consistent.
--- xen/arch/x86/hvm/svm/intr.c | 19 ++- xen/arch/x86/hvm/svm/nestedsvm.c | 291 +++++++++++++++++++++++---------------- xen/arch/x86/hvm/svm/svm.c | 76 +++++----- 3 files changed, 225 insertions(+), 161 deletions(-)
xen/arch/x86/hvm/svm/intr.c +12 -7
@@ -1,6 +1,6 @@/* * intr.c: Interrupt handling for SVM. -* Copyright (c) 2005, AMD Inc. +* Copyright (c) 2005, AMD Inc. * Copyright (c) 2004, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it
@@ -83,9 +83,12 @@ static void svm_enable_intr_window(struct vcpu *v, struct hvm_intack intack)ASSERT (intack.source != hvm_intsrc_none); -if (nestedhvm_enabled (v->domain) ) { +if (nestedhvm_enabled (v->domain) ) + {struct nestedvcpu *nv = &vcpu_nestedhvm (v); -if ( nv->nv_vmentry_pending ) { + +if ( nv->nv_vmentry_pending ) + {struct vmcb_struct *gvmcb = nv->nv_vvmcx;/* check if l1 guest injects interrupt into l2 guest via vintr.
@@ -131,7 +134,7 @@ static void svm_enable_intr_window(struct vcpu *v, struct hvm_intack intack) vmcb, general1_intercepts | GENERAL1_INTERCEPT_VINTR); } -void svm_intr_assist (void ) +void svm_intr_assist (void ) {struct vcpu *v = current;struct vmcb_struct *vmcb = v->arch.hvm.svm.vmcb;
@@ -151,7 +154,8 @@ void svm_intr_assist(void)return ; intblk =hvm_interrupt_blocked (v, intack); -if ( intblk == hvm_intblk_svm_gif ) { +if ( intblk == hvm_intblk_svm_gif ) + {ASSERT (nestedhvm_enabled (v->domain));return ; }
@@ -167,10 +171,11 @@ void svm_intr_assist(void)* the l1 guest occurred. */ rc =nestedsvm_vcpu_interrupt (v, intack); -switch (rc) { +switch ( rc ) + {case NSVM_INTR_NOTINTERCEPTED :/* Inject interrupt into 2nd level guest directly. */ -break ; +break ;case NSVM_INTR_NOTHANDLED :case NSVM_INTR_FORCEVMEXIT :return ;
xen/arch/x86/hvm/svm/nestedsvm.c +171 -120
771 lines not on this page · raw message
xen/arch/x86/hvm/svm/svm.c +42 -34
217 lines not on this page · raw message
Signature · 1 line
2.11.0
Quoted 3 lines · Andrew Cooper
No functional change.
Signed-off-by Andrew Cooper <[email protected]>
Acked-by Jan Beulich <[email protected]>