VMX: disable event injection if requested by VMM

2019-04-12 13:53:24 +02:00
parent b74e427801
commit a8411389df
1 changed files with 6 additions and 0 deletions
--- a/kernel/fiasco/src/kern/ia32/vm_vmx.cpp
+++ b/kernel/fiasco/src/kern/ia32/vm_vmx.cpp
@@ -306,6 +306,12 @@ Vm_vmx_t<X>::load_guest_state(Cpu_number cpu, void *src)

      Vmx::vmwrite(Vmx::F_entry_int_info, irq_info);
    }
+  else
+    {
+      // switch off event injection if requested but still pending in hw
+      if (Vmx::vmread<Mword>(Vmx::F_entry_int_info) & (1UL << 31))
+        Vmx::vmwrite(Vmx::F_entry_int_info, irq_info);
+    }

  // hm, we have to check for sanitizing the cr0 and cr4 shadow stuff
  load(0x6000, 0x6006, src);