From fb24979c516e51d98f016771e4e821ba3a5dab20 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sat, 15 Mar 2025 21:09:12 +0100 Subject: [PATCH] Reduce verbosity of debug logs during booting These logs are only useful when actively working on the respective driver. --- graphics/driver-graphics/src/lib.rs | 10 ++++------ pcid/src/cfg_access/mod.rs | 4 ++-- pcid/src/driver_interface/cap.rs | 10 +++++----- virtio-core/src/probe.rs | 2 -- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/graphics/driver-graphics/src/lib.rs b/graphics/driver-graphics/src/lib.rs index 03cab9c6e7..f06dbf59b4 100644 --- a/graphics/driver-graphics/src/lib.rs +++ b/graphics/driver-graphics/src/lib.rs @@ -154,8 +154,6 @@ impl Scheme for GraphicsScheme { let vt = screen.next().unwrap_or("").parse::().unwrap(); let id = screen.next().unwrap_or("").parse::().unwrap_or(0); - dbg!(vt, id); - if id >= self.adapter.displays().len() { return Err(Error::new(EINVAL)); } @@ -233,11 +231,11 @@ impl Scheme for GraphicsScheme { fn mmap_prep( &mut self, id: usize, - offset: u64, - size: usize, - flags: MapFlags, + _offset: u64, + _size: usize, + _flags: MapFlags, ) -> syscall::Result { - log::info!("KSMSG MMAP {} {:?} {} {}", id, flags, offset, size); + // log::trace!("KSMSG MMAP {} {:?} {} {}", id, _flags, _offset, _size); let handle = self.handles.get(&id).ok_or(Error::new(EINVAL))?; let Handle::Screen { vt, screen } = handle; let framebuffer = &self.vts_fb[vt][screen]; diff --git a/pcid/src/cfg_access/mod.rs b/pcid/src/cfg_access/mod.rs index 476592dd66..58de2a5556 100644 --- a/pcid/src/cfg_access/mod.rs +++ b/pcid/src/cfg_access/mod.rs @@ -151,8 +151,8 @@ impl Mcfg { if table_filename.get(0..4) == Some(&MCFG_NAME) { let bytes = fs::read(table_path)?.into_boxed_slice(); match Mcfg::parse(&*bytes) { - Some((mcfg, allocs)) => { - log::info!("MCFG {mcfg:?} ALLOCS {allocs:?}"); + Some((_mcfg, allocs)) => { + log::info!("MCFG ALLOCS {:?}", allocs.0); return f(allocs, Vec::new(), [u32::MAX, u32::MAX, u32::MAX, u32::MAX]); } None => { diff --git a/pcid/src/driver_interface/cap.rs b/pcid/src/driver_interface/cap.rs index 4e1b746a6d..19521608f8 100644 --- a/pcid/src/driver_interface/cap.rs +++ b/pcid/src/driver_interface/cap.rs @@ -10,12 +10,12 @@ pub struct VendorSpecificCapability { impl VendorSpecificCapability { pub unsafe fn parse(addr: PciCapabilityAddress, access: &dyn ConfigRegionAccess) -> Self { let dword = access.read(addr.address, addr.offset); - let next = (dword >> 8) & 0xFF; let length = ((dword >> 16) & 0xFF) as u16; - log::info!( - "Vendor specific offset: {:#02x} next: {next:#02x} cap len: {length:#02x}", - addr.offset - ); + // let next = (dword >> 8) & 0xFF; + // log::trace!( + // "Vendor specific offset: {:#02x} next: {next:#02x} cap len: {length:#02x}", + // addr.offset + // ); let data = if length > 0 { assert!( length > 3 && length % 4 == 0, diff --git a/virtio-core/src/probe.rs b/virtio-core/src/probe.rs index 25cf1efb92..be3977d96b 100644 --- a/virtio-core/src/probe.rs +++ b/virtio-core/src/probe.rs @@ -122,8 +122,6 @@ pub fn probe_device(pcid_handle: &mut PciFunctionHandle) -> Result unreachable!(), } - - log::trace!("virtio-core::device-probe: {capability:?}"); } let common_addr = common_addr.expect("virtio common capability missing");