diff --git a/src/python/gem5/simulate/exit_event.py b/src/python/gem5/simulate/exit_event.py
index 3fd12c371b..b902643a3f 100644
--- a/src/python/gem5/simulate/exit_event.py
+++ b/src/python/gem5/simulate/exit_event.py
@@ -53,6 +53,8 @@ class ExitEvent(Enum):
     PERF_COUNTER_DISABLE = "performance counter disabled"
     PERF_COUNTER_RESET = "performance counter reset"
     PERF_COUNTER_INTERRUPT = "performance counter interrupt"
+    KERNEL_PANIC = "kernel panic in simulated system"
+    KERNEL_OOPS = "kernel oops in simulated system"
 
     @classmethod
     def translate_exit_status(cls, exit_string: str) -> "ExitEvent":
@@ -103,6 +105,10 @@ class ExitEvent(Enum):
             return ExitEvent.PERF_COUNTER_RESET
         elif exit_string == "performance counter interrupt":
             return ExitEvent.PERF_COUNTER_INTERRUPT
+        elif exit_string == "Kernel panic in simulated system.":
+            return ExitEvent.KERNEL_PANIC
+        elif exit_string == "Kernel oops in simulated system.":
+            return ExitEvent.KERNEL_OOPS
         elif exit_string.endswith("will terminate the simulation.\n"):
             # This is for the traffic generator exit event
             return ExitEvent.EXIT
diff --git a/src/python/gem5/simulate/simulator.py b/src/python/gem5/simulate/simulator.py
index fcbfb6d57d..708a484ead 100644
--- a/src/python/gem5/simulate/simulator.py
+++ b/src/python/gem5/simulate/simulator.py
@@ -308,6 +308,8 @@ class Simulator:
                 "max instructions",
                 "exiting the simulation",
             )(),
+            ExitEvent.KERNEL_PANIC: exit_generator(),
+            ExitEvent.KERNEL_OOPS: exit_generator(),
         }
 
         if on_exit_event: