diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-08-07 11:49:46 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-10 10:46:36 +0300 |
commit | 26666957a58fab7c8a4a31f1ab24d3bbf4c58c7a (patch) | |
tree | 1bfeba7ec127deb3ae05cebd118dada7b2ef866e /arch/x86 | |
parent | cda0ffdd862d36d0b054249ce920f00d1dbae037 (diff) | |
download | op-kernel-dev-26666957a58fab7c8a4a31f1ab24d3bbf4c58c7a.zip op-kernel-dev-26666957a58fab7c8a4a31f1ab24d3bbf4c58c7a.tar.gz |
KVM: SVM: move nested_svm_intr main logic out of if-clause
This patch removes one indentation level from nested_svm_intr and
makes the logic more readable.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kvm/svm.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index a1cfa7d..144f202 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1374,19 +1374,20 @@ static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, static inline int nested_svm_intr(struct vcpu_svm *svm) { - if (is_nested(svm)) { - if (!(svm->vcpu.arch.hflags & HF_VINTR_MASK)) - return 0; + if (!is_nested(svm)) + return 0; - if (!(svm->vcpu.arch.hflags & HF_HIF_MASK)) - return 0; + if (!(svm->vcpu.arch.hflags & HF_VINTR_MASK)) + return 0; - svm->vmcb->control.exit_code = SVM_EXIT_INTR; + if (!(svm->vcpu.arch.hflags & HF_HIF_MASK)) + return 0; - if (nested_svm_exit_handled(svm)) { - nsvm_printk("VMexit -> INTR\n"); - return 1; - } + svm->vmcb->control.exit_code = SVM_EXIT_INTR; + + if (nested_svm_exit_handled(svm)) { + nsvm_printk("VMexit -> INTR\n"); + return 1; } return 0; |