@@ -45,7 +45,7 @@ use crate::hypervisor::LinuxInterruptHandle;
4545#[ cfg( crashdump) ]
4646use crate :: hypervisor:: crashdump;
4747#[ cfg( gdb) ]
48- use crate :: hypervisor:: gdb:: DebugError ;
48+ use crate :: hypervisor:: gdb:: { DebugError , DebugMemoryAccessError } ;
4949#[ cfg( gdb) ]
5050use crate :: hypervisor:: hyperlight_vm:: debug:: ProcessDebugRequestError ;
5151use crate :: hypervisor:: regs:: CommonSpecialRegisters ;
@@ -838,7 +838,7 @@ impl HyperlightVm {
838838 dbg_mem_access_fn : Arc < Mutex < SandboxMemoryManager < HostSharedMemory > > > ,
839839 stop_reason : VcpuStopReason ,
840840 ) -> std:: result:: Result < ( ) , HandleDebugError > {
841- use crate :: hypervisor:: gdb:: { DebugError , DebugMemoryAccess } ;
841+ use crate :: hypervisor:: gdb:: DebugMemoryAccess ;
842842 use crate :: hypervisor:: hyperlight_vm:: debug:: ProcessDebugRequestError ;
843843
844844 if self . gdb_conn . is_none ( ) {
@@ -894,9 +894,9 @@ impl HyperlightVm {
894894 match result {
895895 Ok ( response) => response,
896896 // Treat non fatal errors separately so the guest doesn't fail
897- Err ( ProcessDebugRequestError :: Debug ( DebugError :: TranslateGva (
898- _ ,
899- ) ) ) => DebugResponse :: ErrorOccurred ,
897+ Err ( ProcessDebugRequestError :: ReadMemory (
898+ DebugMemoryAccessError :: TranslateGuestAddress ( _ ) ,
899+ ) ) => DebugResponse :: ErrorOccurred ,
900900 Err ( e) => {
901901 log:: error!( "Error processing debug request: {:?}" , e) ;
902902 return Err ( HandleDebugError :: ProcessRequest ( e) ) ;
@@ -938,9 +938,9 @@ impl HyperlightVm {
938938 let response = match result {
939939 Ok ( response) => response,
940940 // Treat non fatal errors separately so the guest doesn't fail
941- Err ( ProcessDebugRequestError :: Debug ( DebugError :: TranslateGva ( _ ) ) ) => {
942- DebugResponse :: ErrorOccurred
943- }
941+ Err ( ProcessDebugRequestError :: ReadMemory (
942+ DebugMemoryAccessError :: TranslateGuestAddress ( _ ) ,
943+ ) ) => DebugResponse :: ErrorOccurred ,
944944 Err ( e) => {
945945 return Err ( HandleDebugError :: ProcessRequest ( e) ) ;
946946 }
0 commit comments