qcow2-rs: fix devide-by-zero on i386 arch

Signed-off-by: Ming Lei <[email protected]>
ublk-org · Sep 23, 2024 · 43a70e7 · 43a70e7
1 parent 0b69e85
commit 43a70e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/dev.rs b/src/dev.rs
@@ -218,10 +218,10 @@ impl Qcow2Info {
         refcount_order: u8,
         bs: usize,
     ) -> usize {
-        let rb_entries = cluster_size * 8 / (1 << refcount_order);
-        let rt_entry_size = rb_entries * cluster_size;
+        let rb_entries = (cluster_size as u64) * 8 / (1 << refcount_order);
+        let rt_entry_size = rb_entries * (cluster_size as u64);
 
-        let rc_table_entries = (size + rt_entry_size as u64 - 1) / rt_entry_size as u64;
+        let rc_table_entries = (size + rt_entry_size - 1) / rt_entry_size;
         let rc_table_size =
             ((rc_table_entries as usize * std::mem::size_of::<u64>()) + bs - 1) & !(bs - 1);
 

diff --git a/src/meta.rs b/src/meta.rs
@@ -650,8 +650,8 @@ impl Qcow2Header {
             libc::memset((buf_start + l1_table.0) as *mut libc::c_void, 0, block_size);
         }
 
-        let l2_entries = cluster_size / 8;
-        let size_per_l1_entry = (l2_entries << cluster_bits) as u64;
+        let l2_entries = (cluster_size as u64) / 8;
+        let size_per_l1_entry = l2_entries << cluster_bits;
         let l1_entries = (size + size_per_l1_entry - 1) / size_per_l1_entry;
 
         let mut h = Qcow2RawHeader {