Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/muvm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "muvm"
version = "0.4.1"
version = "0.5.0"
authors = ["Sergio Lopez <slp@redhat.com>", "Teoh Han Hui <teohhanhui@gmail.com>", "Sasha Finkelstein <fnkl.kernel@gmail.com>", "Asahi Lina <lina@asahilina.net>"]
edition = "2021"
rust-version = "1.80.0"
Expand Down
7 changes: 2 additions & 5 deletions crates/muvm/src/guest/bridge/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -982,11 +982,8 @@ pub fn bridge_loop<T: ProtocolHandler>(sock_path: &str) {
let events = evt.events();
if fd == listen_sock.as_raw_fd() as u64 {
let res = listen_sock.accept();
if res.is_err() {
eprintln!(
"Failed to accept a connection, error: {:?}",
res.unwrap_err()
);
if let Err(res) = res {
eprintln!("Failed to accept a connection, error: {res:?}");
continue;
}
let stream = res.unwrap().0;
Expand Down
7 changes: 2 additions & 5 deletions crates/muvm/src/guest/server_worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,8 @@ fn run_io_guest(
let mut vsock = StdUnixStream::from(vsock_fd);
let epoll = Epoll::new(EpollCreateFlags::empty())?;
epoll.add(&stdout, EpollEvent::new(EpollFlags::EPOLLIN, 1))?;
if stderr.is_some() {
epoll.add(
stderr.as_ref().unwrap(),
EpollEvent::new(EpollFlags::EPOLLIN, 2),
)?;
if let Some(ref stderr) = stderr {
epoll.add(stderr, EpollEvent::new(EpollFlags::EPOLLIN, 2))?;
}
epoll.add(&vsock, EpollEvent::new(EpollFlags::EPOLLIN, 3))?;
epoll.add(&stop_pipe, EpollEvent::new(EpollFlags::EPOLLIN, 4))?;
Expand Down
23 changes: 6 additions & 17 deletions crates/muvm/src/hidpipe_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,8 @@ where
return true;
}
let res = f(v);
if res.is_err() {
error!(
"Client {} disconnected with error: {:?}",
*k,
res.unwrap_err()
);
if let Err(res) = res {
error!("Client {} disconnected with error: {:?}", *k, res,);
epoll.delete(&v.socket).unwrap();
false
} else {
Expand All @@ -277,12 +273,8 @@ where
{
let client = clients.get_mut(&fd).unwrap();
let res = f(client);
if res.is_err() {
error!(
"Client {} disconnected with error: {:?}",
fd,
res.unwrap_err()
);
if let Err(res) = res {
error!("Client {} disconnected with error: {:?}", fd, res,);
epoll.delete(&client.socket).unwrap();
clients.remove(&fd);
}
Expand Down Expand Up @@ -400,11 +392,8 @@ fn run(mut evdevs: EvdevContainer, listen_sock: UnixListener, epoll: Epoll) {
}
} else if fd == listen_sock.as_raw_fd() as u64 {
let res = listen_sock.accept();
if res.is_err() {
error!(
"Failed to accept a connection, error: {:?}",
res.unwrap_err()
);
if let Err(res) = res {
error!("Failed to accept a connection, error: {:?}", res,);
continue;
}
let stream = res.unwrap().0;
Expand Down
Loading