From 6ab43eb9d8c40ea1dc24a29b5f6dd28f6791f40f Mon Sep 17 00:00:00 2001
From: Luoyuan Xiao <xiaoluoyuan@163.com>
Date: Fri, 27 May 2022 14:21:33 +0800
Subject: [PATCH] To meet test CI conditions

---
 drivers/src/bus/mod.rs                     |  1 +
 kernel-hal/src/bare/arch/riscv/drivers.rs  | 13 ++++++++-----
 kernel-hal/src/bare/arch/x86_64/drivers.rs | 13 ++++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/src/bus/mod.rs b/drivers/src/bus/mod.rs
index 7d771ca4..6f31fd1d 100644
--- a/drivers/src/bus/mod.rs
+++ b/drivers/src/bus/mod.rs
@@ -1,5 +1,6 @@
 #![allow(unused)]
 
+#[cfg(any(target_arch = "x86_64", target_arch = "riscv64"))]
 pub mod pci;
 
 pub fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
diff --git a/kernel-hal/src/bare/arch/riscv/drivers.rs b/kernel-hal/src/bare/arch/riscv/drivers.rs
index 38c6c9b0..7a7779df 100644
--- a/kernel-hal/src/bare/arch/riscv/drivers.rs
+++ b/kernel-hal/src/bare/arch/riscv/drivers.rs
@@ -1,9 +1,7 @@
 use alloc::boxed::Box;
 use alloc::format;
-use alloc::sync::Arc;
 
 use zcore_drivers::builder::{DevicetreeDriverBuilder, IoMapper};
-use zcore_drivers::bus::pci;
 use zcore_drivers::irq::riscv::ScauseIntCode;
 use zcore_drivers::uart::BufferedUart;
 use zcore_drivers::{Device, DeviceResult};
@@ -64,9 +62,14 @@ pub(super) fn init() -> DeviceResult {
         }
     }
 
-    let pci_devs = pci::init(Some(Arc::new(IoMapperImpl)))?;
-    for d in pci_devs.into_iter() {
-        drivers::add_device(d);
+    #[cfg(not(feature = "loopback"))]
+    {
+        use alloc::sync::Arc;
+        use zcore_drivers::bus::pci;
+        let pci_devs = pci::init(Some(Arc::new(IoMapperImpl)))?;
+        for d in pci_devs.into_iter() {
+            drivers::add_device(d);
+        }
     }
 
     intc_init()?;
diff --git a/kernel-hal/src/bare/arch/x86_64/drivers.rs b/kernel-hal/src/bare/arch/x86_64/drivers.rs
index fe75db99..ebc5ac9f 100644
--- a/kernel-hal/src/bare/arch/x86_64/drivers.rs
+++ b/kernel-hal/src/bare/arch/x86_64/drivers.rs
@@ -1,6 +1,5 @@
 use alloc::{boxed::Box, sync::Arc};
 
-use zcore_drivers::bus::pci;
 use zcore_drivers::irq::x86::Apic;
 use zcore_drivers::scheme::IrqScheme;
 use zcore_drivers::uart::{BufferedUart, Uart16550Pmio};
@@ -48,10 +47,14 @@ pub(super) fn init() -> DeviceResult {
 
     drivers::add_device(Device::Irq(irq));
 
-    // PCI scan
-    let pci_devs = pci::init(None)?;
-    for d in pci_devs.into_iter() {
-        drivers::add_device(d);
+    #[cfg(not(feature = "loopback"))]
+    {
+        // PCI scan
+        use zcore_drivers::bus::pci;
+        let pci_devs = pci::init(None)?;
+        for d in pci_devs.into_iter() {
+            drivers::add_device(d);
+        }
     }
 
     #[cfg(feature = "graphic")]