Changeset 80084 in vbox

Timestamp:

Jul 31, 2019 6:44:47 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132524

Message:

hmvmxinline.h: Kicking out 32-bit host support, added VMX[Read|Write]Vmcs16 for upcoming changes bugref:9511

File:

• trunk/include/VBox/vmm/hmvmxinline.h (modified) (2 diffs)

trunk/include/VBox/vmm/hmvmxinline.h

@@ -558 +558 @@
 
 
+/**
+ * Executes VMWRITE for a 16-bit VMCS field.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS.
+ * @retval  VERR_VMX_INVALID_VMCS_PTR.
+ * @retval  VERR_VMX_INVALID_VMCS_FIELD.
+ *
+ * @param   uVmcsField  The VMCS field.
+ * @param   u16Val      The 16-bit value to set.
+ *
+ * @remarks The values of the two status codes can be OR'ed together, the result
+ *          will be VERR_VMX_INVALID_VMCS_PTR.
+ */
+DECLINLINE(int) VMXWriteVmcs16(uint32_t uVmcsField, uint16_t u16Val)
+{
+    Assert(RT_BF_GET(uVmcsField, VMX_BF_VMCSFIELD_WIDTH) == VMXVMCSFIELDWIDTH_16BIT);
+    return VMXWriteVmcs64(uVmcsField, u16Val);
+}
+
+
 #ifdef RT_ARCH_AMD64
 # define VMXWriteVmcsHstN       VMXWriteVmcs64
@@ -715 +736 @@
 #endif
 
+
+/**
+ * Executes VMREAD for a 64-bit field.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS.
+ * @retval  VERR_VMX_INVALID_VMCS_PTR.
+ * @retval  VERR_VMX_INVALID_VMCS_FIELD.
+ *
+ * @param   uVmcsField  The VMCS field.
+ * @param   pData       Where to store VMCS field value.
+ *
+ * @remarks The values of the two status codes can be OR'ed together, the result
+ *          will be VERR_VMX_INVALID_VMCS_PTR.
+ */
+DECLINLINE(int) VMXReadVmcs16(uint32_t uVmcsField, uint16_t *pData)
+{
+    AssertMsg(RT_BF_GET(uVmcsField, VMX_BF_VMCSFIELD_WIDTH) == VMXVMCSFIELDWIDTH_16BIT, ("%#RX32\n", uVmcsField));
+    uint64_t u64Tmp;
+    int rc = VMXReadVmcs64(uVmcsField, &u64Tmp);
+    *pData = (uint16_t)u64Tmp;
+    return rc;
+}
+
+
 #ifdef RT_ARCH_AMD64
 # define VMXReadVmcsHstN        VMXReadVmcs64