|
16 | 16 | #[path = "vm_aarch64.rs"] |
17 | 17 | mod aarch64; |
18 | 18 | #[cfg(target_arch = "x86_64")] |
19 | | -#[path = "vm_x86_64.rs"] |
| 19 | +#[path = "vm_x86_64/vm_x86_64.rs"] |
20 | 20 | mod x86_64; |
21 | 21 |
|
22 | 22 | use std::collections::HashMap; |
@@ -717,42 +717,42 @@ impl Vm for KvmVm { |
717 | 717 |
|
718 | 718 | #[cfg(target_arch = "x86_64")] |
719 | 719 | fn sev_launch_start(&self, policy: SevPolicy) -> Result<(), Error> { |
720 | | - self.kvm_sev_launch_start(policy) |
| 720 | + KvmVm::sev_launch_start(self, policy) |
721 | 721 | } |
722 | 722 |
|
723 | 723 | #[cfg(target_arch = "x86_64")] |
724 | 724 | 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) |
726 | 726 | } |
727 | 727 |
|
728 | 728 | #[cfg(target_arch = "x86_64")] |
729 | 729 | fn sev_launch_update_vmsa(&self) -> Result<(), Error> { |
730 | | - self.kvm_sev_launch_update_vmsa() |
| 730 | + KvmVm::sev_launch_update_vmsa(self) |
731 | 731 | } |
732 | 732 |
|
733 | 733 | #[cfg(target_arch = "x86_64")] |
734 | 734 | fn sev_launch_measure(&self) -> Result<Vec<u8>, Error> { |
735 | | - self.kvm_sev_launch_measure() |
| 735 | + KvmVm::sev_launch_measure(self) |
736 | 736 | } |
737 | 737 |
|
738 | 738 | #[cfg(target_arch = "x86_64")] |
739 | 739 | fn sev_launch_finish(&self) -> Result<(), Error> { |
740 | | - self.kvm_sev_launch_finish() |
| 740 | + KvmVm::sev_launch_finish(self) |
741 | 741 | } |
742 | 742 |
|
743 | 743 | #[cfg(target_arch = "x86_64")] |
744 | 744 | fn snp_launch_start(&self, policy: SnpPolicy) -> Result<()> { |
745 | | - self.kvm_snp_launch_start(policy) |
| 745 | + KvmVm::snp_launch_start(self, policy) |
746 | 746 | } |
747 | 747 |
|
748 | 748 | #[cfg(target_arch = "x86_64")] |
749 | 749 | 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_) |
751 | 751 | } |
752 | 752 |
|
753 | 753 | #[cfg(target_arch = "x86_64")] |
754 | 754 | fn snp_launch_finish(&self) -> Result<()> { |
755 | | - self.kvm_snp_launch_finish() |
| 755 | + KvmVm::snp_launch_finish(self) |
756 | 756 | } |
757 | 757 |
|
758 | 758 | #[cfg(target_arch = "aarch64")] |
|
0 commit comments