Skip to content

Commit d224d07

Browse files
committed
format changes
Signed-off-by: Doru Blânzeanu <[email protected]>
1 parent cec6a81 commit d224d07

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

src/hyperlight_host/src/hypervisor/gdb/event_loop.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ impl run_blocking::BlockingEventLoop for GdbBlockingEventLoop {
5353
}
5454
}
5555

56-
5756
if conn.peek().map(|b| b.is_some()).unwrap_or(false) {
5857
let byte = conn
5958
.read()

src/hyperlight_host/src/hypervisor/gdb/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ impl GdbConnection {
9393
}
9494

9595
/// Creates a thread that handles gdb protocol
96-
pub fn create_gdb_thread(
97-
mut target: HyperlightKvmSandboxTarget
98-
) -> Result<(), GdbTargetError> {
96+
pub fn create_gdb_thread(mut target: HyperlightKvmSandboxTarget) -> Result<(), GdbTargetError> {
9997
// TODO: Address multiple sandboxes scenario
10098
let socket = format!("localhost:{}", 8081);
10199

src/hyperlight_host/src/hypervisor/gdb/target.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ use gdbstub::arch::Arch;
55
use gdbstub::common::Signal;
66
use gdbstub::stub::{BaseStopReason, SingleThreadStopReason};
77
use gdbstub::target::ext::base::singlethread::{
8-
SingleThreadBase,
9-
SingleThreadResume, SingleThreadResumeOps,
10-
SingleThreadSingleStep, SingleThreadSingleStepOps,
8+
SingleThreadBase, SingleThreadResume, SingleThreadResumeOps, SingleThreadSingleStep,
9+
SingleThreadSingleStepOps,
1110
};
1211
use gdbstub::target::ext::base::BaseOps;
1312
use gdbstub::target::ext::breakpoints::{
@@ -23,8 +22,7 @@ use kvm_bindings::{
2322
};
2423
use kvm_ioctls::VcpuFd;
2524

26-
use super::GdbConnection;
27-
use super::GdbTargetError;
25+
use super::{GdbConnection, GdbTargetError};
2826
use crate::hypervisor::gdb::{DebugMessage, GdbDebug};
2927
use crate::mem::layout::SandboxMemoryLayout;
3028
use crate::mem::mgr::SandboxMemoryManager;
@@ -533,4 +531,4 @@ impl SingleThreadSingleStep for HyperlightKvmSandboxTarget {
533531
self.set_single_step(true)?;
534532
self.resume_vcpu()
535533
}
536-
}
534+
}

src/hyperlight_host/src/hypervisor/kvm.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,7 @@ impl KVMDriver {
115115

116116
let vcpu_fd = Arc::new(Mutex::new(vcpu_fd));
117117
#[cfg(gdb)]
118-
let gdb_conn = Self::enable_gdb_debug(
119-
mgr,
120-
vcpu_fd.clone(),
121-
entrypoint
122-
)?;
118+
let gdb_conn = Self::enable_gdb_debug(mgr, vcpu_fd.clone(), entrypoint)?;
123119

124120
let rsp_gp = GuestPtr::try_from(RawPtr::from(rsp))?;
125121
Ok(Self {
@@ -148,7 +144,8 @@ impl KVMDriver {
148144
.set_entrypoint_bp()
149145
.map_err(|_| new_error!("Cannot set entrypoint breakpoint"))?;
150146

151-
let _ = gdb::create_gdb_thread(target).map_err(|_| new_error!("Cannot create GDB thread"))?;
147+
let _ =
148+
gdb::create_gdb_thread(target).map_err(|_| new_error!("Cannot create GDB thread"))?;
152149

153150
Ok(gdb_conn)
154151
}

0 commit comments

Comments
 (0)