Skip to content

Commit 77d7707

Browse files
author
Hang SU
committed
vhost-device-console: Improve error handling with descriptive messages
Replace non-informative expect() messages with meaningful error contexts. Signed-off-by: Hang SU <[email protected]>
1 parent 0b6314f commit 77d7707

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

vhost-device-console/src/vhu_console.rs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl VhostUserConsoleBackend {
185185
Self::epoll_register(self.epoll_fd.as_raw_fd(), stdin_fd, epoll::Events::EPOLLIN)
186186
.map_err(|_| Error::EpollAdd)?;
187187
} else {
188-
let listener = TcpListener::bind(tcpaddr_str).expect("asdasd");
188+
let listener = TcpListener::bind(tcpaddr_str).expect("Failed bind tcp address");
189189
self.listener = Some(listener);
190190
}
191191
Ok(())
@@ -530,7 +530,11 @@ impl VhostUserConsoleBackend {
530530
.unwrap();
531531

532532
if self.controller.read().unwrap().backend == BackendType::Network {
533-
let listener_fd = self.listener.as_ref().expect("asd").as_raw_fd();
533+
let listener_fd = self
534+
.listener
535+
.as_ref()
536+
.expect("Failed get tcp listener ref")
537+
.as_raw_fd();
534538
vring_worker
535539
.register_listener(
536540
listener_fd,
@@ -568,7 +572,13 @@ impl VhostUserConsoleBackend {
568572

569573
fn create_new_stream_thread(&mut self) {
570574
// Accept only one incoming connection
571-
if let Some(stream) = self.listener.as_ref().expect("asd").incoming().next() {
575+
if let Some(stream) = self
576+
.listener
577+
.as_ref()
578+
.expect("Failed get tcp listener ref")
579+
.incoming()
580+
.next()
581+
{
572582
match stream {
573583
Ok(stream) => {
574584
let local_addr = self

0 commit comments

Comments
 (0)