From 610f8788943c6da3a05248e960c2ec557c99f08f Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Tue, 9 Jan 2024 13:45:46 +0100 Subject: [PATCH] dragonball: Fix compile error for aarch64 This is to fix a compile error raised for aarch64. Signed-off-by: Hyounggyu Choi --- .../src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs | 3 +++ src/dragonball/src/device_manager/mod.rs | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs b/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs index 43b1a96d6..9b3dabd41 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs +++ b/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs @@ -25,6 +25,9 @@ use crate::{Error as VirtioError, Result as VirtioResult}; enum EndpointProtocolFlags { ProtocolMq = 1, + #[allow(dead_code)] + #[cfg(feature = "vhost-user-blk")] + ProtocolBackend = 2, } pub(super) struct Listener { diff --git a/src/dragonball/src/device_manager/mod.rs b/src/dragonball/src/device_manager/mod.rs index d50294471..f0958b116 100644 --- a/src/dragonball/src/device_manager/mod.rs +++ b/src/dragonball/src/device_manager/mod.rs @@ -1038,9 +1038,7 @@ impl DeviceManager { pub fn get_pci_bus_resources(&self) -> Option { let mut vfio_dev_mgr = self.vfio_manager.lock().unwrap(); let vfio_pci_mgr = vfio_dev_mgr.get_pci_manager(); - if vfio_pci_mgr.is_none() { - return None; - } + vfio_pci_mgr.as_ref()?; let pci_manager = vfio_pci_mgr.unwrap(); let ecam_space = pci_manager.get_ecam_space(); let bar_space = pci_manager.get_bar_space();