DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-10 12:16:48 +00:00
Code Issues Releases Wiki Activity

修改net设备的uevent内容，使之与Linux语义一致

Browse Source
This commit is contained in:
val213 2024-10-14 00:24:52 +08:00
parent 178486f1e5
commit e67348c9b6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/arch/x86_64/syscall/mod.rs
View File

@ -133,7 +133,7 @@ pub extern "sysv64" fn syscall_handler(frame: &mut TrapFrame) {
show &= false; show &= false;
} }
} }
show = false;
if show { if show {
debug!("[SYS] [Pid: {:?}] [Call: {:?}]", pid, to_print); debug!("[SYS] [Pid: {:?}] [Call: {:?}]", pid, to_print);
} }

11
kernel/src/driver/base/uevent/mod.rs
View File

@ -157,13 +157,16 @@ impl Attribute for UeventAttr {
writeln!(&mut uevent_content, "DEVTYPE=char").unwrap(); writeln!(&mut uevent_content, "DEVTYPE=char").unwrap();
} }
DeviceType::Net => { DeviceType::Net => {
// let net_device = device.cast::<dyn Iface>().ok().ok_or(SystemError::EINVAL)?; let net_device = device.clone().cast::<dyn Iface>().map_err(|e: Arc<dyn Device>| {
// let ifindex = net_device.ifindex().expect("Find ifindex error.\n"); warn!("device:{:?} is not a net device!", e);
SystemError::EINVAL
})?;
let iface_id = net_device.nic_id();
// let device_name = net_device.iface_name(); // let device_name = net_device.iface_name();
let device_name = device.name(); let device_name = device.name();
writeln!(&mut uevent_content, "DEVTYPE=net").unwrap(); // writeln!(&mut uevent_content, "DEVTYPE=net").unwrap();
writeln!(&mut uevent_content, "INTERFACE={}", device_name).unwrap(); writeln!(&mut uevent_content, "INTERFACE={}", device_name).unwrap();
// writeln!(&mut uevent_content, "IFINDEX={}", ifindex).unwrap(); writeln!(&mut uevent_content, "IFINDEX={}", iface_id).unwrap();
} }
DeviceType::Bus => { DeviceType::Bus => {
// 处理总线设备类型 // 处理总线设备类型