Changeset 107410 in vbox for trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

Timestamp:

Jan 6, 2025 10:04:59 AM (5 weeks ago)

Author:

vboxsync

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

166461

Message:

VMM/GIMHV: bugref:3409 Fixed two redundant 'if' conditions. Eliminated a redundant assignment (+ followup assert originally intended for debug builds to catch uninitialized 'rc' usage in large switch case).

File:

• trunk/src/VBox/VMM/VMMR3/GIMHv.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -1606 +1606 @@
     AssertCompile(sizeof(size_t) >= sizeof(uint32_t));
     AssertReturn(cbBuf >= cbRead, VERR_INVALID_PARAMETER);
+    Assert(cbRead > 0);
 
     int rc;
@@ -1623 +1624 @@
          */
         PGIMHV pHv = &pVM->gim.s.u.Hv;
-        rc = VERR_GIM_IPE_1;
         switch (pHv->enmDbgReply)
         {
@@ -1770 +1770 @@
             }
         }
-        Assert(rc != VERR_GIM_IPE_1);
 
 #ifdef DEBUG_ramshankar
@@ -2050 +2049 @@
         pOut->cbPending = 0;
     }
-    else if (cbWrite > 0)
+    else
     {
         uint32_t cbWritten = 0;
@@ -2129 +2128 @@
     else if (!cbRead)
         rcHv = GIM_HV_STATUS_SUCCESS;
-    else if (cbRead > 0)
+    else
     {
         int rc2 = gimR3HvDebugRead(pVM, pvData, GIM_HV_PAGE_SIZE, cbRead, pcbReallyRead, cMsTimeout,