Skip to content

Commit c21cfa4

Browse files
committed
Fixing build issues
1 parent 3f194fb commit c21cfa4

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

vm/devices/storage/nvme_resources/src/fault.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ pub enum QueueFaultBehavior<T> {
1717
Default,
1818
}
1919

20+
#[derive(Clone)]
2021
/// A buildable fault configuration
2122
pub struct AdminQueueFaultConfig {
2223
/// A map of NVME opcodes to the fault behavior for each. (This would ideally be a `HashMap`, but `mesh` doesn't support that type. Given that this is not performance sensitive, the lookup is okay)
2324
pub admin_submission_queue_faults: Vec<(u8, QueueFaultBehavior<Command>)>,
2425
}
2526

27+
#[derive(Clone)]
2628
/// A simple fault configuration with admin submission queue support
2729
pub struct FaultConfiguration {
2830
/// Fault active state

vm/devices/storage/nvme_test/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ pub use workers::NvmeFaultControllerClient;
2222

2323
use guestmem::ranges::PagedRange;
2424
use nvme_spec as spec;
25-
use std::sync::Arc;
2625
use workers::NsidConflict;
2726

2827
// Device configuration shared by PCI and NVMe.

vm/devices/storage/nvme_test/src/tests/flr_tests.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ use crate::tests::test_helpers::find_pci_capability;
1010
use chipset_device::pci::PciConfigSpace;
1111
use guestmem::GuestMemory;
1212
use guid::Guid;
13+
use mesh::CellUpdater;
14+
use nvme_resources::fault::AdminQueueFaultConfig;
1315
use nvme_resources::fault::FaultConfiguration;
1416
use pal_async::DefaultDriver;
1517
use pal_async::async_test;
@@ -41,7 +43,10 @@ fn instantiate_controller_with_flr(
4143
subsystem_id: Guid::new_random(),
4244
flr_support,
4345
},
44-
FaultConfiguration { admin_fault: None },
46+
FaultConfiguration {
47+
fault_active: CellUpdater::new(false).cell(),
48+
admin_fault: AdminQueueFaultConfig::new(),
49+
},
4550
)
4651
}
4752

0 commit comments

Comments
 (0)