Skip to content

Commit ece7dac

Browse files
committed
Pausing work again. This will be completed after the Fault Configuration Pr is checked in
1 parent 6b68375 commit ece7dac

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

vm/devices/pci/pci_core/src/spec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ pub mod caps {
433433

434434
/// Device Control Register
435435
#[bitfield(u16)]
436-
#[derive(IntoBytes, Immutable, KnownLayout, FromBytes)]
436+
#[derive(IntoBytes, Immutable, KnownLayout, FromBytes, Inspect)]
437437
pub struct DeviceControl {
438438
pub correctable_error_reporting_enable: bool,
439439
pub non_fatal_error_reporting_enable: bool,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ pub struct NvmeFaultControllerHandle {
4242
pub max_io_queues: u16,
4343
/// The initial set of namespaces.
4444
pub namespaces: Vec<NamespaceDefinition>,
45+
/// Whether to enable flr support.
46+
pub flr_support: bool,
4547
}
4648

4749
impl ResourceId<PciDeviceHandleKind> for NvmeFaultControllerHandle {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
//! Tests for Function Level Reset (FLR) functionality.
55
66
use super::test_helpers::TestNvmeMmioRegistration;
7-
use crate::FaultConfiguration;
87
use crate::NvmeFaultController;
98
use crate::NvmeFaultControllerCaps;
109
use crate::tests::test_helpers::find_pci_capability;
1110
use chipset_device::pci::PciConfigSpace;
1211
use guestmem::GuestMemory;
1312
use guid::Guid;
13+
use nvme_resources::fault::FaultConfiguration;
1414
use pal_async::DefaultDriver;
1515
use pal_async::async_test;
1616
use pci_core::capabilities::pci_express::PCI_EXPRESS_DEVICE_CAPS_FLR_BIT_MASK;

0 commit comments

Comments
 (0)