Changes return type of CpuDebug::reason (#1291)

Author: ultimaweapon

gui/src/hv/linux/cpu.rs

@@ -2,10 +2,8 @@
 use super::arch::{KvmStates, StatesError};
 use super::ffi::{KVM_EXIT_DEBUG, KVM_EXIT_HLT, KVM_EXIT_IO, KVM_RUN};
 use super::run::KvmRun;
-use crate::hv::{Cpu, CpuDebug, CpuExit, CpuIo, CpuRun, IoBuf};
-use gdbstub::stub::MultiThreadStopReason;
+use crate::hv::{Cpu, CpuDebug, CpuExit, CpuIo, CpuRun, DebugEvent, IoBuf};
 use libc::{ioctl, munmap};
-use std::num::NonZero;
 use std::os::fd::{AsRawFd, OwnedFd};
 use std::sync::MutexGuard;
 
@@ -168,15 +166,11 @@ pub struct KvmDebug<'a, 'b>(&'a mut KvmCpu<'b>);
 impl<'b> CpuDebug for KvmDebug<'_, 'b> {
     type Cpu = KvmCpu<'b>;
 
-    fn reason(&mut self) -> MultiThreadStopReason<u64> {
+    fn reason(&mut self) -> DebugEvent {
         let debug = unsafe { (*self.0.cx.0).exit.debug.arch };
 
         match debug.exception {
-            3 => {
-                let tid = NonZero::new(self.0.id + 1).unwrap();
-
-                MultiThreadStopReason::SwBreak(tid)
-            }
+            3 => DebugEvent::SwBreak,
             exception => todo!("unhandled exception {exception}"),
         }
     }

gui/src/hv/macos/cpu.rs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
-use crate::hv::{Cpu, CpuCommit, CpuDebug, CpuExit, CpuIo, CpuRun, CpuStates, IoBuf};
+use crate::hv::{Cpu, CpuCommit, CpuDebug, CpuExit, CpuIo, CpuRun, CpuStates, DebugEvent, IoBuf};
 use aarch64::Esr;
 use applevisor_sys::hv_exit_reason_t::HV_EXIT_REASON_EXCEPTION;
 use applevisor_sys::hv_reg_t::{HV_REG_CPSR, HV_REG_PC, HV_REG_X0, HV_REG_X1};
@@ -11,7 +11,6 @@ use applevisor_sys::{
     hv_return_t, hv_vcpu_destroy, hv_vcpu_exit_t, hv_vcpu_run, hv_vcpu_set_reg,
     hv_vcpu_set_sys_reg, hv_vcpu_t,
 };
-use gdbstub::stub::MultiThreadStopReason;
 use std::marker::PhantomData;
 use std::num::NonZero;
 use thiserror::Error;
@@ -281,7 +280,7 @@ pub struct HvfDebug<'a, 'b>(&'a mut HvfCpu<'b>);
 impl<'a, 'b> CpuDebug for HvfDebug<'a, 'b> {
     type Cpu = HvfCpu<'b>;
 
-    fn reason(&mut self) -> MultiThreadStopReason<u64> {
+    fn reason(&mut self) -> DebugEvent {
         todo!()
     }
 

gui/src/hv/mod.rs

@@ -3,7 +3,6 @@ pub use self::arch::*;
 pub use self::os::{HvError, new};
 pub use self::ram::*;
 
-use gdbstub::stub::MultiThreadStopReason;
 use std::error::Error;
 
 #[cfg_attr(target_arch = "aarch64", path = "aarch64.rs")]
@@ -94,6 +93,11 @@ pub enum IoBuf<'a> {
 pub trait CpuDebug {
     type Cpu: Cpu;
 
-    fn reason(&mut self) -> MultiThreadStopReason<u64>;
+    fn reason(&mut self) -> DebugEvent;
     fn cpu(&mut self) -> &mut Self::Cpu;
 }
+
+/// The debug event that cause the VM to exit.
+pub enum DebugEvent {
+    SwBreak,
+}

gui/src/hv/windows/cpu.rs

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
-use crate::hv::{Cpu, CpuCommit, CpuDebug, CpuExit, CpuIo, CpuRun, CpuStates, IoBuf};
-use gdbstub::stub::MultiThreadStopReason;
+use crate::hv::{Cpu, CpuCommit, CpuDebug, CpuExit, CpuIo, CpuRun, CpuStates, DebugEvent, IoBuf};
 use std::marker::PhantomData;
 use std::mem::{MaybeUninit, size_of, zeroed};
 use thiserror::Error;
@@ -561,7 +560,7 @@ pub struct WhpDebug<'a, 'b> {
 impl<'a, 'b> CpuDebug for WhpDebug<'a, 'b> {
     type Cpu = WhpCpu<'b>;
 
-    fn reason(&mut self) -> MultiThreadStopReason<u64> {
+    fn reason(&mut self) -> DebugEvent {
         todo!()
     }
 

gui/src/vmm/mod.rs

@@ -8,12 +8,13 @@ use self::kernel::{
 };
 use self::ram::{RamBuilder, RamMap};
 use crate::gdb::GdbHandler;
-use crate::hv::{CpuDebug, CpuExit, CpuIo, CpuRun, CpuStates, HvError, Hypervisor, Ram};
+use crate::hv::{
+    CpuDebug, CpuExit, CpuIo, CpuRun, CpuStates, DebugEvent, HvError, Hypervisor, Ram,
+};
 use crate::profile::Profile;
 use config::{BootEnv, ConsoleType, Vm};
 use futures::{FutureExt, select_biased};
 use gdbstub::common::{Signal, Tid};
-use gdbstub::stub::MultiThreadStopReason;
 use gdbstub::target::ext::base::multithread::{
     MultiThreadBase, MultiThreadResume, MultiThreadResumeOps,
 };
@@ -474,7 +475,7 @@ impl<H: Hypervisor> Vmm<H> {
         args: &CpuArgs<H>,
         debug: &self::cpu::debug::Debugger,
         cpu: &mut impl crate::hv::Cpu,
-        stop: Option<MultiThreadStopReason<u64>>,
+        stop: Option<DebugEvent>,
     ) -> Result<Option<bool>, CpuError> {
         // Notify GUI. We need to allow only one CPU to enter the debugger dispatch loop.
         let lock = args.breakpoint.lock().unwrap();