Responding to comments and build errors

Author: gurasinghMS

vm/devices/pci/pci_core/src/capabilities/pci_express.rs

@@ -36,7 +36,7 @@ impl PciExpressState {
 }
 
 #[derive(Inspect)]
-/// PCI Express capability with Function Level Reset support.
+/// Configurable PCI Express capability.
 pub struct PciExpressCapability {
     device_capabilities: pci_express::DeviceCapabilities,
     state: Arc<Mutex<PciExpressState>>,
@@ -97,7 +97,7 @@ impl PciCapability for PciExpressCapability {
                 // PCIe Capabilities Register (16 bits) + Next Pointer (8 bits) + Capability ID (8 bits)
                 // For basic endpoint: Version=2, Device/Port Type=0 (PCI Express Endpoint)
                 let pcie_caps: u16 = 0x0002; // Version 2, Device/Port Type 0
-                (pcie_caps as u32) << 16 | (0x00 << 8) | CapabilityId::PCI_EXPRESS.0 as u32
+                (pcie_caps as u32) << 16 | CapabilityId::PCI_EXPRESS.0 as u32
             }
             PciExpressCapabilityHeader::DEVICE_CAPS => self.device_capabilities.into_bits(),
             PciExpressCapabilityHeader::DEVICE_CTL_STS => {

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

@@ -26,7 +26,6 @@ use pal_async::DefaultDriver;
 use pal_async::async_test;
 use pci_core::msi::MsiInterruptSet;
 use pci_core::test_helpers::TestPciInterruptController;
-use std::sync::Arc;
 use user_driver::backoff::Backoff;
 use vmcore::vm_task::SingleDriverBackend;
 use vmcore::vm_task::VmTaskDriverSource;