fixes after cherry-pick

arceos-hypervisor · Dec 18, 2024 · dc93ad7 · dc93ad7
1 parent 97748ce
commit dc93ad7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/api/arceos_api/Cargo.toml b/api/arceos_api/Cargo.toml
@@ -21,7 +21,6 @@ multitask = ["axtask/multitask", "axsync/multitask", "axfeat/multitask"]
 fs = ["dep:axfs", "dep:axdriver", "axfeat/fs"]
 net = ["dep:axnet", "dep:axdriver", "axfeat/net"]
 display = ["dep:axdisplay", "dep:axdriver", "axfeat/display"]
-ipi = ["dep:axipi", "axfeat/ipi"]
 
 myfs = ["axfeat/myfs"]
 

diff --git a/api/arceos_api/src/lib.rs b/api/arceos_api/src/lib.rs
@@ -392,8 +392,6 @@ pub mod modules {
     pub use axruntime;
     pub use axsync;
 
-    #[cfg(feature = "ipi")]
-    pub use axipi;
     #[cfg(feature = "alloc")]
     pub use axalloc;
     #[cfg(feature = "display")]

diff --git a/api/axfeat/Cargo.toml b/api/axfeat/Cargo.toml
@@ -81,4 +81,3 @@ axsync = { workspace = true, optional = true }
 axtask = { workspace = true, optional = true }
 axipi = { workspace = true, optional = true }
 kspin = { version = "0.1", optional = true }
-axipi = { workspace = true, optional = true }
diff --git a/examples/helloworld/Cargo.toml b/examples/helloworld/Cargo.toml
@@ -7,4 +7,4 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axstd = { workspace = true,features = ["irq"], optional = true }
+axstd = { workspace = true, features = ["irq"], optional = true }
diff --git a/modules/axhal/src/platform/mod.rs b/modules/axhal/src/platform/mod.rs
@@ -26,9 +26,9 @@ cfg_if::cfg_if! {
         mod aarch64_rk3588j;
         pub use self::aarch64_rk3588j::*;
     } else {
-        // mod dummy;
-        // pub use self::dummy::*;
-        mod riscv64_qemu_virt;
-        pub use self::riscv64_qemu_virt::*;
+        mod dummy;
+        pub use self::dummy::*;
+        // mod riscv64_qemu_virt;
+        // pub use self::riscv64_qemu_virt::*;
     }
 }
diff --git a/modules/axhal/src/platform/riscv64_qemu_virt/irq.rs b/modules/axhal/src/platform/riscv64_qemu_virt/irq.rs
@@ -66,9 +66,9 @@ pub const TIMER_IRQ_NUM: usize = S_TIMER;
 pub const IPI_IRQ_NUM: usize = S_SOFT;
 
 macro_rules! with_cause {
-    ($cause: expr, 
-        @TIMER => $timer_op: expr, 
-        @IPI => $ipi_op: expr, 
+    ($cause: expr,
+        @TIMER => $timer_op: expr,
+        @IPI => $ipi_op: expr,
         @EXT => $ext_op: expr $(,)?) => {
         match $cause {
             S_TIMER => $timer_op,
@@ -177,19 +177,3 @@ pub(super) fn init_percpu() {
         sie::set_sext();
     }
 }
-
-#[cfg(feature = "ipi")]
-mod ipi {
-    pub const IPI_IRQ_NUM: usize = 0;
-
-    pub fn send_sgi_one(_dest_cpu: usize, _irq_num: usize) {
-        unimplemented!()
-    }
-
-    pub fn send_sgi_all(_irq_num: usize) {
-        unimplemented!()
-    }
-}
-
-#[cfg(feature = "ipi")]
-pub use ipi::*;