From ca4e14086ff55af57926837ffac581c3d047bd3c Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Wed, 4 Mar 2026 15:40:20 +0800 Subject: [PATCH] runtime-rs: Fix warnings of unformatted codes Fix warnings from unformattted codes. Signed-off-by: Alex Lyn --- .../crates/hypervisor/src/ch/inner_device.rs | 5 +++- .../crates/hypervisor/src/qemu/inner.rs | 23 ++++++++++--------- .../crates/hypervisor/src/qemu/qmp.rs | 21 ++++++++++++----- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/src/ch/inner_device.rs b/src/runtime-rs/crates/hypervisor/src/ch/inner_device.rs index e31119ea95..7ef5fd7dad 100644 --- a/src/runtime-rs/crates/hypervisor/src/ch/inner_device.rs +++ b/src/runtime-rs/crates/hypervisor/src/ch/inner_device.rs @@ -470,7 +470,10 @@ impl CloudHypervisorInner { net_config.id = None; net_config.num_queues = network_queues_pairs * 2; - info!(sl!(), "network device queue pairs {:?}", network_queues_pairs); + info!( + sl!(), + "network device queue pairs {:?}", network_queues_pairs + ); // we need ensure opening network device happens in netns. let netns = self.netns.clone().unwrap_or_default(); diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs b/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs index b7bfe9ad4b..bfaf6380aa 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs @@ -9,8 +9,8 @@ use crate::device::topology::PCIePort; use crate::qemu::qmp::get_qmp_socket_path; use crate::{ device::driver::ProtectionDeviceConfig, hypervisor_persist::HypervisorState, selinux, - HypervisorConfig, MemoryConfig, VcpuThreadIds, VsockDevice, HYPERVISOR_QEMU, - KATA_BLK_DEV_TYPE, KATA_CCW_DEV_TYPE, KATA_NVDIMM_DEV_TYPE, KATA_SCSI_DEV_TYPE, + HypervisorConfig, MemoryConfig, VcpuThreadIds, VsockDevice, HYPERVISOR_QEMU, KATA_BLK_DEV_TYPE, + KATA_CCW_DEV_TYPE, KATA_NVDIMM_DEV_TYPE, KATA_SCSI_DEV_TYPE, }; use crate::utils::{ @@ -138,15 +138,16 @@ impl QemuInner { &block_dev.config.path_on_host, block_dev.config.is_readonly, )?, - KATA_CCW_DEV_TYPE | KATA_BLK_DEV_TYPE | KATA_SCSI_DEV_TYPE => cmdline.add_block_device( - block_dev.device_id.as_str(), - &block_dev.config.path_on_host, - block_dev - .config - .is_direct - .unwrap_or(self.config.blockdev_info.block_device_cache_direct), - block_dev.config.driver_option.as_str() == KATA_SCSI_DEV_TYPE, - )?, + KATA_CCW_DEV_TYPE | KATA_BLK_DEV_TYPE | KATA_SCSI_DEV_TYPE => cmdline + .add_block_device( + block_dev.device_id.as_str(), + &block_dev.config.path_on_host, + block_dev + .config + .is_direct + .unwrap_or(self.config.blockdev_info.block_device_cache_direct), + block_dev.config.driver_option.as_str() == KATA_SCSI_DEV_TYPE, + )?, unsupported => { info!(sl!(), "unsupported block device driver: {}", unsupported) } diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs index 367567a384..87679da703 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs @@ -187,11 +187,21 @@ impl Qmp { continue; } (None, _) => { - warn!(sl!(), "hotpluggable vcpu {} has no socket_id for driver {}, skipping", core_id, driver); + warn!( + sl!(), + "hotpluggable vcpu {} has no socket_id for driver {}, skipping", + core_id, + driver + ); continue; } (_, None) => { - warn!(sl!(), "hotpluggable vcpu {} has no thread_id for driver {}, skipping", core_id, driver); + warn!( + sl!(), + "hotpluggable vcpu {} has no thread_id for driver {}, skipping", + core_id, + driver + ); continue; } } @@ -753,10 +763,9 @@ impl Qmp { Ok((None, Some(scsi_addr))) } else if block_driver == VIRTIO_BLK_CCW { - let subchannel = self - .ccw_subchannel - .as_mut() - .ok_or_else(|| anyhow!("CCW subchannel not available for virtio-blk-ccw hotplug"))?; + let subchannel = self.ccw_subchannel.as_mut().ok_or_else(|| { + anyhow!("CCW subchannel not available for virtio-blk-ccw hotplug") + })?; let slot = subchannel .add_device(&node_name)