github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-27 20:18:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11618 from RuoqingHe/fix-dragonball-default-build

Browse Source 
dragonball: Fix warnings in default build
This commit is contained in:
RuoqingHe 2025-07-28 11:24:46 +08:00 committed by GitHub
commit 3f46347dc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dragonball/dbs_utils/src/net/mac.rs
View File

@ -146,7 +146,6 @@ mod tests {
assert!(MacAddr::from_bytes(&src3[..]).is_err()); assert!(MacAddr::from_bytes(&src3[..]).is_err());
} }
#[cfg(feature = "with-serde")]
#[test] #[test]
fn test_mac_addr_serialization_and_deserialization() { fn test_mac_addr_serialization_and_deserialization() {
let mac: MacAddr = let mac: MacAddr =

12
src/dragonball/dbs_virtio_devices/src/vsock/mod.rs
View File

@ -313,8 +313,8 @@ mod tests {
pub struct TestContext { pub struct TestContext {
pub cid: u64, pub cid: u64,
pub mem: GuestMemoryMmap, pub mem: GuestMemoryMmap,
pub mem_size: usize, pub _mem_size: usize,
pub epoll_manager: EpollManager, pub _epoll_manager: EpollManager,
pub device: Vsock<Arc<GuestMemoryMmap>, TestMuxer>, pub device: Vsock<Arc<GuestMemoryMmap>, TestMuxer>,
} }
@ -327,8 +327,8 @@ mod tests {
Self { Self {
cid: CID, cid: CID,
mem, mem,
mem_size: MEM_SIZE, _mem_size: MEM_SIZE,
epoll_manager: epoll_manager.clone(), _epoll_manager: epoll_manager.clone(),
device: Vsock::new_with_muxer( device: Vsock::new_with_muxer(
CID, CID,
Arc::new(defs::QUEUE_SIZES.to_vec()), Arc::new(defs::QUEUE_SIZES.to_vec()),
@ -394,7 +394,7 @@ mod tests {
EventHandlerContext { EventHandlerContext {
guest_rxvq, guest_rxvq,
guest_txvq, guest_txvq,
guest_evvq, _guest_evvq: guest_evvq,
queues, queues,
epoll_handler: None, epoll_handler: None,
device: Vsock::new_with_muxer( device: Vsock::new_with_muxer(
@ -422,7 +422,7 @@ mod tests {
pub queues: Vec<VirtioQueueConfig<QueueSync>>, pub queues: Vec<VirtioQueueConfig<QueueSync>>,
pub guest_rxvq: GuestQ<'a>, pub guest_rxvq: GuestQ<'a>,
pub guest_txvq: GuestQ<'a>, pub guest_txvq: GuestQ<'a>,
pub guest_evvq: GuestQ<'a>, pub _guest_evvq: GuestQ<'a>,
pub mem: Arc<GuestMemoryMmap>, pub mem: Arc<GuestMemoryMmap>,
} }

3
src/dragonball/src/api/v1/vmm_action.rs
View File

@ -17,7 +17,6 @@ use tracing::instrument;
use crate::error::{Result, StartMicroVmError, StopMicrovmError}; use crate::error::{Result, StartMicroVmError, StopMicrovmError};
use crate::event_manager::EventManager; use crate::event_manager::EventManager;
use crate::tracer::{DragonballTracer, TraceError, TraceInfo}; use crate::tracer::{DragonballTracer, TraceError, TraceInfo};
use crate::vcpu::VcpuManagerError;
use crate::vm::{CpuTopology, KernelConfigInfo, VmConfigInfo}; use crate::vm::{CpuTopology, KernelConfigInfo, VmConfigInfo};
use crate::vmm::Vmm; use crate::vmm::Vmm;
@ -55,6 +54,8 @@ pub use crate::device_manager::virtio_net_dev_mgr::{
}; };
#[cfg(feature = "virtio-vsock")] #[cfg(feature = "virtio-vsock")]
pub use crate::device_manager::vsock_dev_mgr::{VsockDeviceConfigInfo, VsockDeviceError}; pub use crate::device_manager::vsock_dev_mgr::{VsockDeviceConfigInfo, VsockDeviceError};
#[cfg(feature = "host-device")]
use crate::vcpu::VcpuManagerError;
#[cfg(feature = "hotplug")] #[cfg(feature = "hotplug")]
pub use crate::vcpu::{VcpuResizeError, VcpuResizeInfo}; pub use crate::vcpu::{VcpuResizeError, VcpuResizeInfo};

7
src/dragonball/src/device_manager/mod.rs
View File

@ -879,7 +879,7 @@ impl DeviceManager {
/// Start all registered devices when booting the associated virtual machine. /// Start all registered devices when booting the associated virtual machine.
pub fn start_devices( pub fn start_devices(
&mut self, &mut self,
vm_as: &GuestAddressSpaceImpl, #[allow(unused)] vm_as: &GuestAddressSpaceImpl,
) -> std::result::Result<(), StartMicroVmError> { ) -> std::result::Result<(), StartMicroVmError> {
// It is safe because we don't expect poison lock. // It is safe because we don't expect poison lock.
#[cfg(feature = "host-device")] #[cfg(feature = "host-device")]
@ -899,6 +899,7 @@ impl DeviceManager {
address_space: Option<&AddressSpace>, address_space: Option<&AddressSpace>,
) -> Result<()> { ) -> Result<()> {
// create context for removing devices // create context for removing devices
#[allow(unused)]
let mut ctx = DeviceOpContext::new( let mut ctx = DeviceOpContext::new(
Some(epoll_mgr), Some(epoll_mgr),
self, self,
@ -1275,7 +1276,9 @@ mod tests {
use dbs_address_space::{AddressSpaceLayout, AddressSpaceRegion, AddressSpaceRegionType}; use dbs_address_space::{AddressSpaceLayout, AddressSpaceRegion, AddressSpaceRegionType};
use kvm_ioctls::Kvm; use kvm_ioctls::Kvm;
use test_utils::skip_if_not_root; use test_utils::skip_if_not_root;
use vm_memory::{GuestAddress, GuestUsize, MmapRegion}; #[cfg(feature = "virtio-fs")]
use vm_memory::MmapRegion;
use vm_memory::{GuestAddress, GuestUsize};
use super::*; use super::*;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]