virtio/vsock: Fix clippy warnings

Signed-off-by: Tyler Fanelli <[email protected]>

Author: tylerfanelli

src/devices/src/virtio/vsock/device.rs

@@ -33,9 +33,9 @@ pub(crate) const EVQ_INDEX: usize = 2;
 /// - VIRTIO_F_VERSION_1: the device conforms to at least version 1.0 of the VirtIO spec.
 /// - VIRTIO_F_IN_ORDER: the device returns used buffers in the same order that the driver makes
 ///   them available.
-pub(crate) const AVAIL_FEATURES: u64 = 1 << uapi::VIRTIO_F_VERSION_1 as u64
-    | 1 << uapi::VIRTIO_F_IN_ORDER as u64
-    | 1 << uapi::VIRTIO_VSOCK_F_DGRAM;
+pub(crate) const AVAIL_FEATURES: u64 = (1 << uapi::VIRTIO_F_VERSION_1 as u64)
+    | (1 << uapi::VIRTIO_F_IN_ORDER as u64)
+    | (1 << uapi::VIRTIO_VSOCK_F_DGRAM);
 
 pub struct Vsock {
     cid: u64,

src/devices/src/virtio/vsock/muxer.rs

@@ -273,7 +273,7 @@ impl VsockMuxer {
             match req._type {
                 defs::SOCK_STREAM => {
                     debug!("vsock: proxy create stream");
-                    let id = (req.peer_port as u64) << 32 | defs::TSI_PROXY_PORT as u64;
+                    let id = ((req.peer_port as u64) << 32) | (defs::TSI_PROXY_PORT as u64);
                     match TcpProxy::new(
                         id,
                         self.cid,
@@ -295,7 +295,7 @@ impl VsockMuxer {
                 }
                 defs::SOCK_DGRAM => {
                     debug!("vsock: proxy create dgram");
-                    let id = (req.peer_port as u64) << 32 | defs::TSI_PROXY_PORT as u64;
+                    let id = ((req.peer_port as u64) << 32) | (defs::TSI_PROXY_PORT as u64);
                     match UdpProxy::new(
                         id,
                         self.cid,
@@ -321,7 +321,7 @@ impl VsockMuxer {
     fn process_connect(&self, pkt: &VsockPacket) {
         debug!("vsock: proxy connect request");
         if let Some(req) = pkt.read_connect_req() {
-            let id = (req.peer_port as u64) << 32 | defs::TSI_PROXY_PORT as u64;
+            let id = ((req.peer_port as u64) << 32) | (defs::TSI_PROXY_PORT as u64);
             debug!("vsock: proxy connect request: id={}", id);
             let update = self
                 .proxy_map
@@ -339,7 +339,7 @@ impl VsockMuxer {
     fn process_getname(&self, pkt: &VsockPacket) {
         debug!("vsock: new getname request");
         if let Some(req) = pkt.read_getname_req() {
-            let id = (req.peer_port as u64) << 32 | (req.local_port as u64);
+            let id = ((req.peer_port as u64) << 32) | (req.local_port as u64);
             debug!(
                 "vsock: new getname request: id={}, peer_port={}, local_port={}",
                 id, req.peer_port, req.local_port
@@ -354,7 +354,7 @@ impl VsockMuxer {
     fn process_sendto_addr(&self, pkt: &VsockPacket) {
         debug!("vsock: new DGRAM sendto addr: src={}", pkt.src_port());
         if let Some(req) = pkt.read_sendto_addr() {
-            let id = (req.peer_port as u64) << 32 | defs::TSI_PROXY_PORT as u64;
+            let id = ((req.peer_port as u64) << 32) | (defs::TSI_PROXY_PORT as u64);
             debug!("vsock: new DGRAM sendto addr: id={}", id);
             let update = self
                 .proxy_map
@@ -370,7 +370,7 @@ impl VsockMuxer {
     }
 
     fn process_sendto_data(&self, pkt: &VsockPacket) {
-        let id = (pkt.src_port() as u64) << 32 | defs::TSI_PROXY_PORT as u64;
+        let id = ((pkt.src_port() as u64) << 32) | (defs::TSI_PROXY_PORT as u64);
         debug!("vsock: DGRAM sendto data: id={} src={}", id, pkt.src_port());
         if let Some(proxy) = self.proxy_map.read().unwrap().get(&id) {
             proxy.lock().unwrap().sendto_data(pkt);