From 605a237d531dafffc783dbd9e6cfec89261d37b0 Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Wed, 2 Aug 2023 15:10:40 +0800 Subject: [PATCH] Pacify the linter for supporting multiple devices --- services/comps/block/src/lib.rs | 3 ++- services/comps/network/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/comps/block/src/lib.rs b/services/comps/block/src/lib.rs index ef7cc1a3c..7f87f1074 100644 --- a/services/comps/block/src/lib.rs +++ b/services/comps/block/src/lib.rs @@ -44,7 +44,8 @@ impl BLKComponent { pub fn init() -> Result { let virtio = jinux_virtio::VIRTIO_COMPONENT.get().unwrap(); let devices = virtio.get_device(VirtioDeviceType::Block); - for device in devices { + // FIXME: deal with multiple block devices + if let Some(device) = devices.into_iter().next() { let v_device = VirtioBlockDevice::new(device); return Ok(Self { blk_device: Arc::new(v_device), diff --git a/services/comps/network/src/lib.rs b/services/comps/network/src/lib.rs index 361d134fa..c339f4d6d 100644 --- a/services/comps/network/src/lib.rs +++ b/services/comps/network/src/lib.rs @@ -41,9 +41,9 @@ pub fn probe_virtio_net() -> Result { virtio.get_device(VirtioDeviceType::Network) }; - for device in network_devices { + // FIXME: deal with multiple net devices + if let Some(device) = network_devices.into_iter().next() { let virtio_net = VirtioNet::new(device); - // FIXME: deal with multiple net devices return Ok(virtio_net); }