Преглед изворни кода

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

黄铭涛 пре 5 месеци
родитељ
комит
15cedf3085
2 измењених фајлова са 2 додато и 6 уклоњено
  1. 1 3
      kernel/src/driver/block/virtio_blk.rs
  2. 1 3
      kernel/src/driver/net/virtio_net.rs

+ 1 - 3
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);
     }

+ 1 - 3
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);
     }