DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-09 07:06:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #995 from 1037827920/patch-fix-virtio_error_handle

Browse Source 
去除virtio_blk, virtio_net expect错误处理，直接返回错误
This commit is contained in:
Samuel Dai 2024-10-17 16:33:06 +08:00 committed by GitHub
commit bb23a0424a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,9 +470,7 @@ impl KObject for VirtIOBlkDevice {
#[unified_init(INITCALL_POSTCORE)] #[unified_init(INITCALL_POSTCORE)]
fn virtio_blk_driver_init() -> Result<(), SystemError> { fn virtio_blk_driver_init() -> Result<(), SystemError> {
let driver = VirtIOBlkDriver::new(); let driver = VirtIOBlkDriver::new();
virtio_driver_manager() virtio_driver_manager().register(driver.clone() as Arc<dyn VirtIODriver>)?;
.register(driver.clone() as Arc<dyn VirtIODriver>)
.expect("Add virtio block driver failed");
unsafe { unsafe {
VIRTIO_BLK_DRIVER = Some(driver); VIRTIO_BLK_DRIVER = Some(driver);
} }

4
kernel/src/driver/net/virtio_net.rs
View File

@ -727,9 +727,7 @@ impl KObject for VirtioInterface {
#[unified_init(INITCALL_POSTCORE)] #[unified_init(INITCALL_POSTCORE)]
fn virtio_net_driver_init() -> Result<(), SystemError> { fn virtio_net_driver_init() -> Result<(), SystemError> {
let driver = VirtIONetDriver::new(); let driver = VirtIONetDriver::new();
virtio_driver_manager() virtio_driver_manager().register(driver.clone() as Arc<dyn VirtIODriver>)?;
.register(driver.clone() as Arc<dyn VirtIODriver>)
.expect("Add virtio net driver failed");
unsafe { unsafe {
VIRTIO_NET_DRIVER = Some(driver); VIRTIO_NET_DRIVER = Some(driver);
} }