fix(vsock): Fix formating issue and code style

Author: archevel

src/executor/vsock.rs

@@ -87,8 +87,7 @@ async fn vsock_run() {
 			let header_cid_inner: u32 = header_cid;
 			let raw_port = header.src_port.to_ne();
 			let raw = if matches!(op, Op::Rw | Op::Shutdown | Op::CreditUpdate | Op::Response) {
-				if let Some(conn) =
-					vsock_guard.get_mut_connected(port, header_cid_inner, raw_port)
+				if let Some(conn) = vsock_guard.get_mut_connected(port, header_cid_inner, raw_port)
 				{
 					conn
 				} else if let Some(s) = vsock_guard.get_mut_socket(port) {

src/fd/socket/vsock.rs

@@ -256,42 +256,37 @@ impl ObjectInterface for Socket {
 					}
 				}
 				VsockState::ReceiveRequest => {
-					let result = {
-						const HEADER_SIZE: usize = size_of::<Hdr>();
-						let mut driver_guard = hardware::get_vsock_driver().unwrap().lock();
-						let local_cid = driver_guard.get_cid();
-
-						driver_guard.send_packet(HEADER_SIZE, |buffer| {
-							let response = unsafe { &mut *buffer.as_mut_ptr().cast::<Hdr>() };
-
-							response.src_cid = le64::from_ne(local_cid);
-							response.dst_cid = le64::from_ne(raw.remote_cid.into());
-							response.src_port = le32::from_ne(port);
-							response.dst_port = le32::from_ne(raw.remote_port);
-							response.len = le32::from_ne(0);
-							response.type_ = le16::from_ne(Type::Stream.into());
-							if local_cid != u64::from(cid) && cid != u32::MAX {
-								response.op = le16::from_ne(Op::Rst.into());
-							} else {
-								response.op = le16::from_ne(Op::Response.into());
-							}
-							response.flags = le32::from_ne(0);
-							response.buf_alloc = le32::from_ne(
-								crate::executor::vsock::RAW_SOCKET_BUFFER_SIZE as u32,
-							);
-							response.fwd_cnt = le32::from_ne(raw.fwd_cnt);
-						});
-
-						let endpoint = VsockEndpoint::new(raw.remote_port, raw.remote_cid);
+					const HEADER_SIZE: usize = size_of::<Hdr>();
+					let mut driver_guard = hardware::get_vsock_driver().unwrap().lock();
+					let local_cid = driver_guard.get_cid();
+
+					driver_guard.send_packet(HEADER_SIZE, |buffer| {
+						let response = unsafe { &mut *buffer.as_mut_ptr().cast::<Hdr>() };
+
+						response.src_cid = le64::from_ne(local_cid);
+						response.dst_cid = le64::from_ne(raw.remote_cid.into());
+						response.src_port = le32::from_ne(port);
+						response.dst_port = le32::from_ne(raw.remote_port);
+						response.len = le32::from_ne(0);
+						response.type_ = le16::from_ne(Type::Stream.into());
+						if local_cid != u64::from(cid) && cid != u32::MAX {
+							response.op = le16::from_ne(Op::Rst.into());
+						} else {
+							response.op = le16::from_ne(Op::Response.into());
+						}
+						response.flags = le32::from_ne(0);
+						response.buf_alloc =
+							le32::from_ne(crate::executor::vsock::RAW_SOCKET_BUFFER_SIZE as u32);
+						response.fwd_cnt = le32::from_ne(raw.fwd_cnt);
+					});
 
-						// Move the accepted connection to an ephemeral port so the
-						// listener entry can be reset to Listen for the next accept.
-						let conn_port = guard.move_to_ephemeral(port)?;
+					let endpoint = VsockEndpoint::new(raw.remote_port, raw.remote_cid);
 
-						Poll::Ready(Ok((conn_port, endpoint)))
-					};
+					// Move the accepted connection to an ephemeral port so the
+					// listener entry can be reset to Listen for the next accept.
+					let conn_port = guard.move_to_ephemeral(port)?;
 
-					result
+					Poll::Ready(Ok((conn_port, endpoint)))
 				}
 				_ => Poll::Ready(Err(Errno::Badf)),
 			}

xtask/src/ci/qemu.rs

@@ -185,10 +185,10 @@ impl Qemu {
 		if matches!(
 			image_name,
 			"axum-example"
-				| "http_server" | "http_server_poll"
+				| "http_server"
+				| "http_server_poll"
 				| "http_server_select"
-				| "vsock"
-				| "vsock_server"
+				| "vsock" | "vsock_server"
 		) || self.devices.contains(&Device::CadenceGem)
 		// sifive_u, on which we test CadenceGem, does not support software shutdowns, so we have to terminate the machine ourselves.
 		{