From 38957fe00b71a79fe1e2f16063a334e6ee79074c Mon Sep 17 00:00:00 2001 From: Chao Wu Date: Sun, 3 Jul 2022 23:34:26 +0800 Subject: [PATCH] UT: fix compile error in unit tests fix compile error in unit tests for DummyConfigInfo. Signed-off-by: Chao Wu --- src/dragonball/src/address_space_manager.rs | 4 ++-- src/dragonball/src/api/v1/vmm_action.rs | 1 - src/dragonball/src/config_manager.rs | 3 +-- src/dragonball/src/vcpu/vcpu_impl.rs | 9 --------- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/dragonball/src/address_space_manager.rs b/src/dragonball/src/address_space_manager.rs index 5a54c0da01..9992833e0c 100644 --- a/src/dragonball/src/address_space_manager.rs +++ b/src/dragonball/src/address_space_manager.rs @@ -867,8 +867,8 @@ mod tests { assert_eq!(&builder.get_next_mem_file(), "/tmp/shmem"); assert_eq!(builder.mem_index, 3); - builder.set_prealloc(true); - builder.set_dirty_page_logging(true); + builder.toggle_prealloc(true); + builder.toggle_dirty_page_logging(true); assert!(builder.mem_prealloc); assert!(builder.dirty_page_logging); } diff --git a/src/dragonball/src/api/v1/vmm_action.rs b/src/dragonball/src/api/v1/vmm_action.rs index dfba2faf13..2e284d79ba 100644 --- a/src/dragonball/src/api/v1/vmm_action.rs +++ b/src/dragonball/src/api/v1/vmm_action.rs @@ -10,7 +10,6 @@ use std::fs::File; use std::sync::mpsc::{Receiver, Sender, TryRecvError}; use log::{debug, error, info, warn}; -use vmm_sys_util::eventfd::EventFd; use crate::error::{Result, StartMicrovmError, StopMicrovmError}; use crate::event_manager::EventManager; diff --git a/src/dragonball/src/config_manager.rs b/src/dragonball/src/config_manager.rs index cbfb790413..a80fd14c72 100644 --- a/src/dragonball/src/config_manager.rs +++ b/src/dragonball/src/config_manager.rs @@ -30,7 +30,6 @@ macro_rules! get_bucket_update { } }}; } -pub(crate) use get_bucket_update; /// Trait for generic configuration information. pub trait ConfigItem { @@ -414,7 +413,7 @@ mod tests { Exist, } - #[derive(Clone, Debug)] + #[derive(Clone, Debug, Default)] pub struct DummyConfigInfo { id: String, content: String, diff --git a/src/dragonball/src/vcpu/vcpu_impl.rs b/src/dragonball/src/vcpu/vcpu_impl.rs index 2dbccf66d0..513fa435f9 100644 --- a/src/dragonball/src/vcpu/vcpu_impl.rs +++ b/src/dragonball/src/vcpu/vcpu_impl.rs @@ -966,15 +966,6 @@ pub mod tests { fn test_vcpu_check_io_port_info() { let (vcpu, _receiver) = create_vcpu(); - // boot complete signal - let res = vcpu - .check_io_port_info( - MAGIC_IOPORT_SIGNAL_GUEST_BOOT_COMPLETE, - &[MAGIC_VALUE_SIGNAL_GUEST_BOOT_COMPLETE], - ) - .unwrap(); - assert!(res); - // debug info signal let res = vcpu .check_io_port_info(MAGIC_IOPORT_DEBUG_INFO, &[0, 0, 0, 0])