Changeset 107110 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 22, 2024 10:01:03 AM (2 months ago)

Author:

vboxsync

Message:

VMM/DBGFR3Bp: Some cleanups, bugref:3409

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3Bp.cpp (modified) (2 diffs)

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

@@ -2007 +2007 @@
                 uint8_t abInstr[DBGF_BP_INSN_MAX];
                 RTGCPTR const GCPtrInstr = CPUMGetGuestFlatPC(pVCpu);
-                int rc = PGMPhysSimpleReadGCPtr(pVCpu, &abInstr[0], GCPtrInstr, sizeof(abInstr));
-                AssertRC(rc);
-                if (RT_SUCCESS(rc))
+                rcStrict = PGMPhysSimpleReadGCPtr(pVCpu, &abInstr[0], GCPtrInstr, sizeof(abInstr));
+                if (rcStrict == VINF_SUCCESS)
                 {
 #ifdef VBOX_VMM_TARGET_ARMV8
                     AssertFailed();
-                    rc = VERR_NOT_IMPLEMENTED;
+                    rcStrict = VERR_NOT_IMPLEMENTED;
 #else
                     /* Replace the int3 with the original instruction byte. */
@@ -2025 +2024 @@
                                                                       DBGF_BP_F_HIT_EXEC_AFTER);
                         if (rcStrict2 == VINF_SUCCESS)
-                            return VBOXSTRICTRC_VAL(rcStrict);
+                            return rcStrict;
                         if (rcStrict2 != VINF_DBGF_BP_HALT)
                             return VERR_DBGF_BP_OWNER_CALLBACK_WRONG_STATUS;
                     }
                     else
-                        return VBOXSTRICTRC_VAL(rcStrict);
+                        return rcStrict;
                 }
             }