Skip to content

Commit 5070eff

Browse files
committed
refactor(kvm): move SEV VM ioctls to a separate module
Signed-off-by: Changyuan Lyu <changyuanl@google.com>
1 parent e7ababb commit 5070eff

File tree

5 files changed

+258
-235
lines changed

5 files changed

+258
-235
lines changed

alioth/src/hv/kvm/vm/vm.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#[path = "vm_aarch64.rs"]
1717
mod aarch64;
1818
#[cfg(target_arch = "x86_64")]
19-
#[path = "vm_x86_64.rs"]
19+
#[path = "vm_x86_64/vm_x86_64.rs"]
2020
mod x86_64;
2121

2222
use std::collections::HashMap;
@@ -717,42 +717,42 @@ impl Vm for KvmVm {
717717

718718
#[cfg(target_arch = "x86_64")]
719719
fn sev_launch_start(&self, policy: SevPolicy) -> Result<(), Error> {
720-
self.kvm_sev_launch_start(policy)
720+
KvmVm::sev_launch_start(self, policy)
721721
}
722722

723723
#[cfg(target_arch = "x86_64")]
724724
fn sev_launch_update_data(&self, range: &mut [u8]) -> Result<(), Error> {
725-
self.kvm_sev_launch_update_data(range)
725+
KvmVm::sev_launch_update_data(self, range)
726726
}
727727

728728
#[cfg(target_arch = "x86_64")]
729729
fn sev_launch_update_vmsa(&self) -> Result<(), Error> {
730-
self.kvm_sev_launch_update_vmsa()
730+
KvmVm::sev_launch_update_vmsa(self)
731731
}
732732

733733
#[cfg(target_arch = "x86_64")]
734734
fn sev_launch_measure(&self) -> Result<Vec<u8>, Error> {
735-
self.kvm_sev_launch_measure()
735+
KvmVm::sev_launch_measure(self)
736736
}
737737

738738
#[cfg(target_arch = "x86_64")]
739739
fn sev_launch_finish(&self) -> Result<(), Error> {
740-
self.kvm_sev_launch_finish()
740+
KvmVm::sev_launch_finish(self)
741741
}
742742

743743
#[cfg(target_arch = "x86_64")]
744744
fn snp_launch_start(&self, policy: SnpPolicy) -> Result<()> {
745-
self.kvm_snp_launch_start(policy)
745+
KvmVm::snp_launch_start(self, policy)
746746
}
747747

748748
#[cfg(target_arch = "x86_64")]
749749
fn snp_launch_update(&self, range: &mut [u8], gpa: u64, type_: SnpPageType) -> Result<()> {
750-
self.kvm_snp_launch_update(range, gpa, type_)
750+
KvmVm::snp_launch_update(self, range, gpa, type_)
751751
}
752752

753753
#[cfg(target_arch = "x86_64")]
754754
fn snp_launch_finish(&self) -> Result<()> {
755-
self.kvm_snp_launch_finish()
755+
KvmVm::snp_launch_finish(self)
756756
}
757757

758758
#[cfg(target_arch = "aarch64")]

alioth/src/hv/kvm/vm/vm_x86_64.rs

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)