[PATCH] Check use I/O bitmap first before unconditional I/O exit

[Zhihui Zhang]

Signed-off-by: Zhihui Zhang <zzhs...@gmail.com>
---
 arch/x86/kvm/vmx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index b2fe1c2..44d4f829 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6460,11 +6460,11 @@ static bool nested_vmx_exit_handled_io(struct kvm_vcpu 
*vcpu,
        int size;
        u8 b;
 
-       if (nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING))
-               return 1;
-
-       if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS))
+       if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS)) {
+               if (nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING))
+                       return 1;
                return 0;
+       }
 
        exit_qualification = vmcs_readl(EXIT_QUALIFICATION);
 
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html