From e164a0d2522a087975c90c984d542f89d2e2b5cb Mon Sep 17 00:00:00 2001 From: Masato Imai Date: Thu, 1 May 2025 08:08:24 +0000 Subject: [PATCH] update rust version --- src/lib.rs | 1 - src/vmm/vcpu.rs | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 20539c4..e95e246 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,6 @@ #![feature(custom_test_frameworks)] #![feature(abi_x86_interrupt)] #![feature(alloc_error_handler)] -#![feature(naked_functions)] #![test_runner(crate::test_runner)] #![reexport_test_harness_main = "test_main"] diff --git a/src/vmm/vcpu.rs b/src/vmm/vcpu.rs index 772eaee..34eb8d3 100644 --- a/src/vmm/vcpu.rs +++ b/src/vmm/vcpu.rs @@ -445,7 +445,7 @@ impl VCpu { vmwrite(vmcs::host::RSP, rsp).unwrap(); } - #[naked] + #[unsafe(naked)] unsafe extern "C" fn asm_vm_entry_resume() -> u16 { const GUEST_REGS_OFFSET: usize = offset_of!(VCpu, guest_registers); @@ -524,7 +524,7 @@ impl VCpu { ); } - #[naked] + #[unsafe(naked)] unsafe extern "C" fn asm_vm_entry() -> u16 { const GUEST_REGS_OFFSET: usize = offset_of!(VCpu, guest_registers); const LAUNCH_DONE: usize = offset_of!(VCpu, launch_done); @@ -609,7 +609,7 @@ impl VCpu { ); } - #[naked] + #[unsafe(naked)] unsafe extern "C" fn guest() -> ! { naked_asm!("2: hlt; jmp 2b"); } @@ -643,7 +643,7 @@ impl VCpu { } } - #[naked] + #[unsafe(naked)] unsafe extern "C" fn vmexit() -> ! { const RAX_OFFSET: usize = offset_of!(GuestRegisters, rax); const RCX_OFFSET: usize = offset_of!(GuestRegisters, rcx);