[Test code] Update types for (in)equality checks

For equalities and inequalities, we can change the types on each side to
always convert to the larger type, which ensures all conversions are
safe.

Signed-off-by: Jonathan Browne <[email protected]>

Author: JBYoshi

src/snapshot-editor/src/edit_memory.rs

@@ -114,8 +114,8 @@ mod tests {
 
     fn check_file_content(file: &File, expected_content: &[u8]) {
         assert_eq!(
-            file.metadata().unwrap().len() as usize,
-            expected_content.len()
+            file.metadata().unwrap().len(),
+            expected_content.len() as u64
         );
         let mut buf = vec![0u8; expected_content.len()];
         file.read_exact_at(buf.as_mut_slice(), 0).unwrap();

src/vmm/src/devices/virtio/block/device.rs

@@ -836,8 +836,8 @@ mod tests {
             let status_addr = GuestAddress(vq.dtable[2].addr.get());
             assert_eq!(used.len, 1);
             assert_eq!(
-                mem.read_obj::<u8>(status_addr).unwrap(),
-                VIRTIO_BLK_S_IOERR as u8
+                u32::from(mem.read_obj::<u8>(status_addr).unwrap()),
+                VIRTIO_BLK_S_IOERR
             );
         }
 
@@ -861,8 +861,8 @@ mod tests {
             let status_addr = GuestAddress(vq.dtable[2].addr.get());
             assert_eq!(used.len, 1);
             assert_eq!(
-                mem.read_obj::<u8>(status_addr).unwrap(),
-                VIRTIO_BLK_S_IOERR as u8
+                u32::from(mem.read_obj::<u8>(status_addr).unwrap()),
+                VIRTIO_BLK_S_IOERR
             );
         }
     }
@@ -1048,8 +1048,8 @@ mod tests {
 
             let status_addr = GuestAddress(vq.dtable[2].addr.get());
             assert_eq!(
-                mem.read_obj::<u8>(status_addr).unwrap(),
-                VIRTIO_BLK_S_IOERR as u8
+                u32::from(mem.read_obj::<u8>(status_addr).unwrap()),
+                VIRTIO_BLK_S_IOERR
             );
         }
 
@@ -1270,8 +1270,8 @@ mod tests {
 
             let status_addr = GuestAddress(vq.dtable[2].addr.get());
             assert_eq!(
-                mem.read_obj::<u8>(status_addr).unwrap(),
-                VIRTIO_BLK_S_IOERR as u8
+                u32::from(mem.read_obj::<u8>(status_addr).unwrap()),
+                VIRTIO_BLK_S_IOERR
             );
         }
     }
@@ -1431,10 +1431,12 @@ mod tests {
             let status_addr = vq.dtable[used.id as usize + 1].addr.get();
             assert_eq!(used.len, 1);
             assert_eq!(
-                vq.memory()
-                    .read_obj::<u8>(GuestAddress(status_addr))
-                    .unwrap(),
-                VIRTIO_BLK_S_OK as u8
+                u32::from(
+                    vq.memory()
+                        .read_obj::<u8>(GuestAddress(status_addr))
+                        .unwrap(),
+                ),
+                VIRTIO_BLK_S_OK
             );
         }
     }

src/vmm/src/devices/virtio/vsock/csm/connection.rs

@@ -1171,7 +1171,10 @@ mod tests {
         assert!(ctx.conn.has_pending_rx());
         ctx.recv();
         assert_eq!(ctx.pkt.op(), uapi::VSOCK_OP_CREDIT_UPDATE);
-        assert_eq!(ctx.pkt.fwd_cnt(), initial_fwd_cnt + data.len() as u32 * 2);
+        assert_eq!(
+            ctx.pkt.fwd_cnt() as usize,
+            initial_fwd_cnt as usize + data.len() * 2,
+        );
         assert_eq!(ctx.conn.fwd_cnt, ctx.conn.last_fwd_cnt_to_peer);
     }
 
@@ -1264,7 +1267,7 @@ mod tests {
         // Fill up the TX buffer.
         let data = vec![0u8; ctx.pkt.buf_size()];
         ctx.init_data_pkt(data.as_slice());
-        for _i in 0..(csm_defs::CONN_TX_BUF_SIZE / data.len() as u32) {
+        for _i in 0..(csm_defs::CONN_TX_BUF_SIZE as usize / data.len()) {
             ctx.send();
         }