From 4de422ad69cdfa6eb658f3ef575ae7647f75103e Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Wed, 19 Feb 2025 16:00:59 +0800 Subject: [PATCH] misc: Fix clippy - manually reimplementing div_ceil Reported by 1.86.0-beta.1 (f0cb41030 2025-02-17). Signed-off-by: Ruoqing He --- arch/src/x86_64/tdx/mod.rs | 2 +- block/src/qcow/mod.rs | 2 +- virtio-devices/src/balloon.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/src/x86_64/tdx/mod.rs b/arch/src/x86_64/tdx/mod.rs index aa74bea9f..dc21d1cc7 100644 --- a/arch/src/x86_64/tdx/mod.rs +++ b/arch/src/x86_64/tdx/mod.rs @@ -299,7 +299,7 @@ pub struct TdHob { } fn align_hob(v: u64) -> u64 { - (v + 7) / 8 * 8 + v.div_ceil(8) * 8 } impl TdHob { diff --git a/block/src/qcow/mod.rs b/block/src/qcow/mod.rs index 802b73066..4a6cb6c15 100644 --- a/block/src/qcow/mod.rs +++ b/block/src/qcow/mod.rs @@ -502,7 +502,7 @@ impl QcowFile { if refcount_bits != 16 { return Err(Error::UnsupportedRefcountOrder); } - let refcount_bytes = (refcount_bits + 7) / 8; + let refcount_bytes = refcount_bits.div_ceil(8); // Need at least one refcount cluster if header.refcount_table_clusters == 0 { diff --git a/virtio-devices/src/balloon.rs b/virtio-devices/src/balloon.rs index d9fa144cd..924475f0e 100644 --- a/virtio-devices/src/balloon.rs +++ b/virtio-devices/src/balloon.rs @@ -108,7 +108,7 @@ struct PartiallyBalloonedPage { impl PartiallyBalloonedPage { fn new() -> Self { let page_size = get_page_size(); - let len = ((page_size >> VIRTIO_BALLOON_PFN_SHIFT) + 63) / 64; + let len = (page_size >> VIRTIO_BALLOON_PFN_SHIFT).div_ceil(64); // Initial each padding bit as 1 in bitmap. let mut bitmap = vec![0_u64; len as usize]; let pad_num = len * 64 - (page_size >> VIRTIO_BALLOON_PFN_SHIFT); @@ -134,7 +134,7 @@ impl PartiallyBalloonedPage { } fn reset(&mut self) { - let len = ((self.page_size >> VIRTIO_BALLOON_PFN_SHIFT) + 63) / 64; + let len = (self.page_size >> VIRTIO_BALLOON_PFN_SHIFT).div_ceil(64); self.addr = 0; self.bitmap = vec![0; len as usize]; let pad_num = len * 64 - (self.page_size >> VIRTIO_BALLOON_PFN_SHIFT);