Skip to content

refine: Refine vm_exit #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junyu0312 merged 1 commit into from
Feb 28, 2026
Merged

refine: Refine vm_exit #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crates/vm-core/src/arch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ pub mod x86_64;
pub mod irq;
pub mod layout;
pub mod vcpu;
pub mod vm_exit;

pub trait Arch {
type VmExitReason;
Expand Down
3 changes: 2 additions & 1 deletion crates/vm-core/src/arch/aarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use crate::arch::Arch;
use crate::arch::aarch64::layout::AArch64Layout;
use crate::arch::vm_exit::aarch64::VmExitReason;
use crate::arch::aarch64::vm_exit::VmExitReason;

pub mod firmware;
pub mod irq;
pub mod layout;
pub mod vcpu;
pub mod vm_exit;

pub struct AArch64 {
pub layout: AArch64Layout,
Expand Down
2 changes: 1 addition & 1 deletion crates/vm-core/src/arch/vm_exit/aarch64.rs → crates/vm-core/src/arch/aarch64/vm_exit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::arch::aarch64::firmware::psci::Psci;
use crate::arch::aarch64::vcpu::AArch64Vcpu;
use crate::arch::aarch64::vcpu::reg::CoreRegister;
use crate::arch::aarch64::vcpu::reg::SysRegister;
use crate::arch::vm_exit::aarch64::smc::handle_smc;
use crate::arch::aarch64::vm_exit::smc::handle_smc;
use crate::device::vm_exit::DeviceVmExitHandler;

pub mod smc;
Expand Down
2 changes: 1 addition & 1 deletion ...s/vm-core/src/arch/vm_exit/aarch64/smc.rs → ...s/vm-core/src/arch/aarch64/vm_exit/smc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::sync::Mutex;

use crate::arch::aarch64::firmware::psci::Psci;
use crate::arch::aarch64::vcpu::AArch64Vcpu;
use crate::arch::vm_exit::aarch64::Error;
use crate::arch::aarch64::vm_exit::Error;

pub fn handle_smc(psci: Arc<Mutex<dyn Psci>>, vcpu: &dyn AArch64Vcpu) -> Result<(), Error> {
let psci = psci.lock().unwrap();
Expand Down
5 changes: 0 additions & 5 deletions crates/vm-core/src/arch/vm_exit.rs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion crates/vm-core/src/arch/x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use crate::arch::Arch;
use crate::arch::vm_exit::x86_64::VmExitReason;
use crate::arch::x86_64::layout::X86_64Layout;
use crate::arch::x86_64::vm_exit::VmExitReason;

pub mod layout;
pub mod vcpu;
pub mod vm_exit;

pub const BASE_ADDRESS: u64 = 0x0;

Expand Down
0 crates/vm-core/src/arch/vm_exit/x86_64.rs → crates/vm-core/src/arch/x86_64/vm_exit.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions crates/vm-core/src/virt/hvp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ use crate::arch::aarch64::vcpu::reg::CoreRegister;
use crate::arch::aarch64::vcpu::reg::SysRegister;
use crate::arch::aarch64::vcpu::reg::cnthctl_el2::CnthctlEl2;
use crate::arch::aarch64::vcpu::reg::sctlr_el1::SctlrEl1;
use crate::arch::aarch64::vm_exit::HandleVmExitResult;
use crate::arch::aarch64::vm_exit::handle_vm_exit;
use crate::arch::irq::InterruptController;
use crate::arch::layout::MemoryLayout;
use crate::arch::vcpu::Vcpu;
use crate::arch::vm_exit::aarch64::HandleVmExitResult;
use crate::arch::vm_exit::aarch64::handle_vm_exit;
use crate::device::mmio::MmioLayout;
use crate::device::vm_exit::DeviceVmExitHandler;
use crate::error::Error;
Expand Down
2 changes: 1 addition & 1 deletion crates/vm-core/src/virt/hvp/vcpu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use crate::arch::aarch64::vcpu::reg::CoreRegister;
use crate::arch::aarch64::vcpu::reg::SysRegister;
use crate::arch::aarch64::vcpu::reg::esr_el2;
use crate::arch::aarch64::vcpu::reg::esr_el2::EsrEl2;
use crate::arch::aarch64::vm_exit::VmExitReason;
use crate::arch::vcpu::Vcpu;
use crate::arch::vm_exit::aarch64::VmExitReason;
use crate::device::mmio::MmioLayout;

enum HvpReg {
Expand Down
2 changes: 1 addition & 1 deletion crates/vm-core/src/virt/kvm/vcpu/arch/aarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::arch::aarch64::AArch64;
use crate::arch::aarch64::vcpu::AArch64Vcpu;
use crate::arch::aarch64::vcpu::reg::CoreRegister;
use crate::arch::aarch64::vcpu::reg::SysRegister;
use crate::arch::vm_exit::aarch64::VmExitReason;
use crate::arch::aarch64::vm_exit::VmExitReason;
use crate::device::mmio::MmioLayout;
use crate::virt::Vcpu;
use crate::virt::kvm::vcpu::KvmVcpu;
Expand Down
2 changes: 1 addition & 1 deletion crates/vm-core/src/virt/kvm/vcpu/arch/x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use kvm_bindings::*;
use kvm_ioctls::Kvm;

use crate::arch::vm_exit::x86_64::VmExitReason;
use crate::arch::x86_64::X86_64;
use crate::arch::x86_64::vcpu::X86Vcpu;
use crate::arch::x86_64::vm_exit::VmExitReason;
use crate::virt::MmioLayout;
use crate::virt::Vcpu;
use crate::virt::kvm::vcpu::KvmVcpu;
Expand Down
Loading