Changeset 77056 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jan 30, 2019 6:00:43 PM (6 years ago)

Author:

vboxsync

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

128501

Message:

VMMDev: Simplify VMMDevReq_HGCMCall,VMMDevReq_HGCMCall32, and VMMDevReq_HGCMCall64 definitions. bugref:9172

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (2 diffs)
• VMMDevHGCM.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1783 +1783 @@
 
 /**
- * Handles VMMDevReq_HGCMCall.
+ * Handles VMMDevReq_HGCMCall32 and VMMDevReq_HGCMCall64.
  *
  * @returns VBox status code that the guest should see.
@@ -2742 +2742 @@
 
 # ifdef VBOX_WITH_64_BITS_GUESTS
+        case VMMDevReq_HGCMCall64:
+# endif
         case VMMDevReq_HGCMCall32:
-        case VMMDevReq_HGCMCall64:
-# else
-        case VMMDevReq_HGCMCall:
-# endif /* VBOX_WITH_64_BITS_GUESTS */
             vmmdevReqHdrSetHgcmAsyncExecute(pThis, GCPhysReqHdr, *ppLock);
             pReqHdr->rc = vmmdevReqHandler_HGCMCall(pThis, pReqHdr, GCPhysReqHdr, tsArrival, ppLock);

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -1049 +1049 @@
                         || enmRequestType == VMMDevReq_HGCMCall64, VERR_INVALID_PARAMETER);
 #else
-    ASSERT_GUEST_RETURN(enmRequestType == VMMDevReq_HGCMCall, VERR_INVALID_PARAMETER);
+    ASSERT_GUEST_RETURN(enmRequestType == VMMDevReq_HGCMCall32, VERR_INVALID_PARAMETER);
 #endif
     RT_UNTRUSTED_VALIDATED_FENCE();
@@ -1372 +1372 @@
 #ifdef VBOX_WITH_64_BITS_GUESTS
                         case VMMDevReq_HGCMCall64:
+#endif
                         case VMMDevReq_HGCMCall32:
-#else
-                        case VMMDevReq_HGCMCall:
-#endif
                         {
                             VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
@@ -1455 +1453 @@
 #ifdef VBOX_WITH_64_BITS_GUESTS
                     case VMMDevReq_HGCMCall64:
+#endif
                     case VMMDevReq_HGCMCall32:
-#else
-                    case VMMDevReq_HGCMCall:
-#endif
                     {
                         VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
@@ -2191 +2187 @@
 
 #ifdef VBOX_WITH_64_BITS_GUESTS
+        case VMMDevReq_HGCMCall64:
+#endif
         case VMMDevReq_HGCMCall32:
-        case VMMDevReq_HGCMCall64:
-#else
-        case VMMDevReq_HGCMCall:
-#endif
         {
             VMMDevHGCMCall *pReq = (VMMDevHGCMCall *)pReqHdr;