Changeset 66318 in vbox

Timestamp:

Mar 29, 2017 6:23:28 AM (8 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Interrupt logic helpers for nested SVM.

Location:

trunk

Files:

• include/VBox/vmm/hm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/hm.h

@@ -154 +154 @@
 VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfRipUpdated);
 VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, RTGCPHYS GCPhysVmcb);
-VMM_INT_DECL(int)               HMSvmNstGstGetInterrupt(PVMCPU pVCpu, PCCPUMCTX pCtx, uint8_t *pu8Interrupt);
-VMM_INT_DECL(bool)              HMSvmNstGstIsInterruptPending(PVMCPU pVCpu, PCCPUMCTX pCtx);
+VMM_INT_DECL(int)               HMSvmNstGstGetInterrupt(PCCPUMCTX pCtx, uint8_t *pu8Interrupt);
+VMM_INT_DECL(bool)              HMSvmNstGstIsInterruptPending(PCCPUMCTX pCtx);
 
 #ifndef IN_RC

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_HM
+#define VMCPU_INCL_CPUM_GST_CTX
 #include "HMInternal.h"
 #include <VBox/vmm/apic.h>
@@ -699 +700 @@
 
 
-VMM_INT_DECL(bool) HMSvmNstGstIsInterruptPending(PVMCPU pVCpu, PCCPUMCTX pCtx)
+/**
+ * Checks whether an interrupt is pending for the nested-guest.
+ *
+ * @returns VBox status code.
+ * @retval  true if there's a pending interrupt, false otherwise.
+ *
+ * @param   pCtx            The guest-CPU context.
+ */
+VMM_INT_DECL(bool) HMSvmNstGstIsInterruptPending(PCCPUMCTX pCtx)
 {
-    RT_NOREF1(pVCpu);
     PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.VmcbCtrl;
-
-    if (    !CPUMIsGuestInNestedHwVirtMode(pCtx)
-        || !pCtx->hwvirt.svm.fGif)
+    if (!CPUMIsGuestInNestedHwVirtMode(pCtx))
         return false;
 
@@ -721 +727 @@
 
 
-VMM_INT_DECL(int) HMSvmNstGstGetInterrupt(PVMCPU pVCpu, PCCPUMCTX pCtx, uint8_t *pu8Interrupt)
+/**
+ * Gets the pending nested-guest interrupt.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_APIC_INTR_MASKED_BY_TPR when an APIC interrupt is pending but
+ *          can't be delivered due to TPR priority.
+ * @retval  VERR_NO_DATA if there is no interrupt to be delivered (either APIC
+ *          has been software-disabled since it flagged something was pending,
+ *          or other reasons).
+ *
+ * @param   pCtx            The guest-CPU context.
+ * @param   pu8Interrupt    Where to store the interrupt.
+ */
+VMM_INT_DECL(int) HMSvmNstGstGetInterrupt(PCCPUMCTX pCtx, uint8_t *pu8Interrupt)
 {
-    RT_NOREF1(pVCpu);
     PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.VmcbCtrl;
-
     /** @todo remove later, paranoia for now. */
 #ifdef DEBUG_ramshankar
-    Assert(HMSvmNstGstIsInterruptPending);
+    Assert(HMSvmNstGstIsInterruptPending(pCtx));
 #endif