去除virtio_blk, virtio_net expect错误处理，直接返回错误

DragonOS-Community · Oct 17, 2024 · 15cedf3 · 15cedf3
1 parent 7ead4a0
commit 15cedf3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/kernel/src/driver/block/virtio_blk.rs b/kernel/src/driver/block/virtio_blk.rs
@@ -470,9 +470,7 @@ impl KObject for VirtIOBlkDevice {
 #[unified_init(INITCALL_POSTCORE)]
 fn virtio_blk_driver_init() -> Result<(), SystemError> {
  let driver = VirtIOBlkDriver::new();
- virtio_driver_manager()
- .register(driver.clone() as Arc<dyn VirtIODriver>)
- .expect("Add virtio block driver failed");
+ virtio_driver_manager().register(driver.clone() as Arc<dyn VirtIODriver>)?;
  unsafe {
  VIRTIO_BLK_DRIVER = Some(driver);
  }

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