DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-26 19:23:23 +00:00
Code Issues Releases Wiki Activity

feat(log): 将内核日志统一为新的logger (#814)

Browse Source
This commit is contained in:
曾俊
2024-05-16 17:25:23 +08:00
committed by GitHub
parent 92deae638b
commit 2eab6dd743
181 changed files with 1321 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/src/driver/block/virtio_blk.rs
View File

@ -5,6 +5,7 @@ use alloc::{
sync::{Arc, Weak},
vec::Vec,
};
use log::{debug, error};
use system_error::SystemError;
use unified_init::macros::unified_init;
use virtio_drivers::device::blk::VirtIOBlk;
@ -63,7 +64,7 @@ pub fn virtio_blk_0() -> Option<Arc<VirtIOBlkDevice>> {
pub fn virtio_blk(transport: VirtIOTransport, dev_id: Arc<DeviceId>) {
let device = VirtIOBlkDevice::new(transport, dev_id);
if let Some(device) = device {
kdebug!("VirtIOBlkDevice '{:?}' created", device.dev_id);
debug!("VirtIOBlkDevice '{:?}' created", device.dev_id);
virtio_device_manager()
.device_add(device.clone() as Arc<dyn VirtIODevice>)
.expect("Add virtio blk failed");
@ -89,7 +90,7 @@ impl VirtIOBlkDevice {
let irq = transport.irq().map(|irq| IrqNumber::new(irq.data()));
let device_inner = VirtIOBlk::<HalImpl, VirtIOTransport>::new(transport);
if let Err(e) = device_inner {
kerror!("VirtIOBlkDevice '{dev_id:?}' create failed: {:?}", e);
error!("VirtIOBlkDevice '{dev_id:?}' create failed: {:?}", e);
return None;
}
@ -134,10 +135,9 @@ impl BlockDevice for VirtIOBlkDevice {
.device_inner
.read_blocks(lba_id_start, &mut buf[..count * LBA_SIZE])
.map_err(|e| {
kerror!(
error!(
"VirtIOBlkDevice '{:?}' read_at_sync failed: {:?}",
self.dev_id,
e
self.dev_id, e
);
SystemError::EIO
})?;
@ -416,7 +416,7 @@ impl VirtIODriver for VirtIOBlkDriver {
.arc_any()
.downcast::<VirtIOBlkDevice>()
.map_err(|_| {
kerror!(
error!(
"VirtIOBlkDriver::probe() failed: device is not a VirtIO block device. Device: '{:?}'",
device.name()
);