fix: adapt nightly 2025

Author: ZR233

src/exception.rs

@@ -325,20 +325,18 @@ fn current_el_sync_handler(tf: &mut TrapFrame) {
 ///
 /// - This function is not typically called directly from Rust code. Instead, it is
 ///   invoked as part of the low-level hypervisor or VM exit handling routines.
-#[naked]
+#[unsafe(naked)]
 #[unsafe(no_mangle)]
 unsafe extern "C" fn vmexit_trampoline() -> ! {
-    unsafe {
-        core::arch::naked_asm!(
-            // Curretly `sp` points to the base address of `Aarch64VCpu.ctx`, which stores guest's `TrapFrame`.
-            "add x9, sp, 34 * 8", // Skip the exception frame.
-            // Currently `x9` points to `&Aarch64VCpu.host_stack_top`, see `run_guest()` in vcpu.rs.
-            "ldr x10, [x9]", // Get `host_stack_top` value from `&Aarch64VCpu.host_stack_top`.
-            "mov sp, x10",   // Set `sp` as the host stack top.
-            restore_regs_from_stack!(), // Restore host function context frame.
-            "ret", // Control flow is handed back to Aarch64VCpu.run(), simulating the normal return of the `run_guest` function.
-        )
-    }
+    core::arch::naked_asm!(
+        // Curretly `sp` points to the base address of `Aarch64VCpu.ctx`, which stores guest's `TrapFrame`.
+        "add x9, sp, 34 * 8", // Skip the exception frame.
+        // Currently `x9` points to `&Aarch64VCpu.host_stack_top`, see `run_guest()` in vcpu.rs.
+        "ldr x10, [x9]", // Get `host_stack_top` value from `&Aarch64VCpu.host_stack_top`.
+        "mov sp, x10",   // Set `sp` as the host stack top.
+        restore_regs_from_stack!(), // Restore host function context frame.
+        "ret", // Control flow is handed back to Aarch64VCpu.run(), simulating the normal return of the `run_guest` function.
+    )
 }
 
 /// Deal with invalid aarch64 exception.

src/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(naked_functions)]
 #![feature(doc_cfg)]
 #![doc = include_str!("../README.md")]
 

src/vcpu.rs

@@ -183,7 +183,7 @@ impl<H: AxVCpuHal> Aarch64VCpu<H> {
     ///
     /// When a VM-Exit happens when guest's vCpu is running,
     /// the control flow will be redirected to this function through `return_run_guest`.
-    #[naked]
+    #[unsafe(naked)]
     unsafe extern "C" fn run_guest(&mut self) -> usize {
         // Fixes: https://github.com/arceos-hypervisor/arm_vcpu/issues/22
         //
@@ -192,25 +192,23 @@ impl<H: AxVCpuHal> Aarch64VCpu<H> {
         // original `run_guest` with the current naked one, we eliminate the dummy code path of the
         // original version, and ensure that the compiler does not perform any unexpected return
         // value optimization.
-        unsafe {
-            core::arch::naked_asm!(
-                // Save host context.
-                save_regs_to_stack!(),
-                // Save current host stack top to `self.host_stack_top`.
-                //
-                // 'extern "C"' here specifies the aapcs64 calling convention, according to which
-                // the first and only parameter, the pointer of self, should be in x0:
-                "mov x9, sp",
-                "add x0, x0, {host_stack_top_offset}",
-                "str x9, [x0]",
-                // Go to `context_vm_entry`.
-                "b context_vm_entry",
-                // Panic if the control flow comes back here, which should never happen.
-                "b {run_guest_panic}",
-                host_stack_top_offset = const core::mem::size_of::<TrapFrame>(),
-                run_guest_panic = sym Self::run_guest_panic,
-            );
-        }
+        core::arch::naked_asm!(
+            // Save host context.
+            save_regs_to_stack!(),
+            // Save current host stack top to `self.host_stack_top`.
+            //
+            // 'extern "C"' here specifies the aapcs64 calling convention, according to which
+            // the first and only parameter, the pointer of self, should be in x0:
+            "mov x9, sp",
+            "add x0, x0, {host_stack_top_offset}",
+            "str x9, [x0]",
+            // Go to `context_vm_entry`.
+            "b context_vm_entry",
+            // Panic if the control flow comes back here, which should never happen.
+            "b {run_guest_panic}",
+            host_stack_top_offset = const core::mem::size_of::<TrapFrame>(),
+            run_guest_panic = sym Self::run_guest_panic,
+        );
     }
 
     /// This function is called when the control flow comes back to `run_guest`. To provide a error