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>
This commit is contained in:
Joerg Roedel 2009-08-07 11:49:46 +02:00 committed by Avi Kivity
parent cda0ffdd86
commit 26666957a5

View file

@ -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) static inline int nested_svm_intr(struct vcpu_svm *svm)
{ {
if (is_nested(svm)) { if (!is_nested(svm))
if (!(svm->vcpu.arch.hflags & HF_VINTR_MASK)) return 0;
return 0;
if (!(svm->vcpu.arch.hflags & HF_HIF_MASK)) if (!(svm->vcpu.arch.hflags & HF_VINTR_MASK))
return 0; 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)) { svm->vmcb->control.exit_code = SVM_EXIT_INTR;
nsvm_printk("VMexit -> INTR\n");
return 1; if (nested_svm_exit_handled(svm)) {
} nsvm_printk("VMexit -> INTR\n");
return 1;
} }
return 0; return 0;