[Test code] Use u64_to_usize in tests

This commit updates test code to use the u64_to_usize function for safe
conversions between the two types.

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

Author: JBYoshi

src/vmm/src/arch/x86_64/regs.rs

@@ -239,13 +239,14 @@ fn setup_page_tables(mem: &GuestMemoryMmap, sregs: &mut kvm_sregs) -> Result<(),
 #[cfg(test)]
 mod tests {
     use kvm_ioctls::Kvm;
+    use utils::u64_to_usize;
     use utils::vm_memory::{Bytes, GuestAddress, GuestMemoryMmap};
 
     use super::*;
 
     fn create_guest_mem(mem_size: Option<u64>) -> GuestMemoryMmap {
         let page_size = 0x10000usize;
-        let mem_size = mem_size.unwrap_or(page_size as u64) as usize;
+        let mem_size = u64_to_usize(mem_size.unwrap_or(page_size as u64));
         if mem_size % page_size == 0 {
             utils::vm_memory::test_utils::create_anon_guest_memory(
                 &[(GuestAddress(0), mem_size)],

src/vmm/src/devices/virtio/balloon/test_utils.rs

@@ -40,7 +40,7 @@ pub fn check_request_completion(queue: &VirtQueue, idx: usize) {
     // Check that the next used will be idx + 1.
     assert_eq!(queue.used.idx.get() as usize, idx + 1);
     // Check that the current used is idx.
-    assert_eq!(queue.used.ring[idx].get().id, idx as u32);
+    assert_eq!(queue.used.ring[idx].get().id as usize, idx);
     // The length of the completed request is 0.
     assert_eq!(queue.used.ring[idx].get().len, 0);
 }

src/vmm/src/devices/virtio/block/io/mod.rs

@@ -190,7 +190,7 @@ pub mod tests {
     use utils::kernel_version::{min_kernel_version_for_io_uring, KernelVersion};
     use utils::tempfile::TempFile;
     use utils::vm_memory::{Bitmap, Bytes, GuestMemory};
-    use utils::{skip_if_io_uring_supported, skip_if_io_uring_unsupported};
+    use utils::{skip_if_io_uring_supported, skip_if_io_uring_unsupported, u64_to_usize};
 
     use super::*;
     use crate::devices::virtio::block::device::FileEngineType;
@@ -251,14 +251,14 @@ pub mod tests {
     fn check_dirty_mem(mem: &GuestMemoryMmap, addr: GuestAddress, len: u32) {
         let bitmap = mem.find_region(addr).unwrap().bitmap().as_ref().unwrap();
         for offset in addr.0..addr.0 + u64::from(len) {
-            assert!(bitmap.dirty_at(offset as usize));
+            assert!(bitmap.dirty_at(u64_to_usize(offset)));
         }
     }
 
     fn check_clean_mem(mem: &GuestMemoryMmap, addr: GuestAddress, len: u32) {
         let bitmap = mem.find_region(addr).unwrap().bitmap().as_ref().unwrap();
         for offset in addr.0..addr.0 + u64::from(len) {
-            assert!(!bitmap.dirty_at(offset as usize));
+            assert!(!bitmap.dirty_at(u64_to_usize(offset)));
         }
     }
 

src/vmm/src/devices/virtio/mmio.rs

@@ -330,6 +330,7 @@ impl MmioTransport {
 pub(crate) mod tests {
     use utils::byte_order::{read_le_u32, write_le_u32};
     use utils::eventfd::EventFd;
+    use utils::u64_to_usize;
     use utils::vm_memory::GuestMemoryMmap;
 
     use super::*;
@@ -406,12 +407,12 @@ pub(crate) mod tests {
         }
 
         fn read_config(&self, offset: u64, data: &mut [u8]) {
-            data.copy_from_slice(&self.config_bytes[offset as usize..]);
+            data.copy_from_slice(&self.config_bytes[u64_to_usize(offset)..]);
         }
 
         fn write_config(&mut self, offset: u64, data: &[u8]) {
             for (i, item) in data.iter().enumerate() {
-                self.config_bytes[offset as usize + i] = *item;
+                self.config_bytes[u64_to_usize(offset) + i] = *item;
             }
         }
 

src/vmm/src/devices/virtio/test_utils.rs

@@ -8,6 +8,7 @@ use std::marker::PhantomData;
 use std::mem;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+use utils::u64_to_usize;
 use utils::vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
 
 use crate::devices::virtio::Queue;
@@ -260,7 +261,7 @@ impl<'a> VirtQueue<'a> {
         let mut x = avail.end().0;
         x = (x + USED_ALIGN - 1) & !(USED_ALIGN - 1);
 
-        let used = VirtqUsed::new(GuestAddress(x), mem, qsize, USED_ALIGN as usize);
+        let used = VirtqUsed::new(GuestAddress(x), mem, qsize, u64_to_usize(USED_ALIGN));
 
         VirtQueue {
             dtable,