From bcbc43c366d94ab6def69d37565de51e1e07bb17 Mon Sep 17 00:00:00 2001 From: Patrick Sabanic Date: Tue, 10 Dec 2024 19:54:08 +0000 Subject: [PATCH] Fix import for runtime.rs --- kernel/src/process_runtime/runtime.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/kernel/src/process_runtime/runtime.rs b/kernel/src/process_runtime/runtime.rs index 7372692ba..02e74076f 100644 --- a/kernel/src/process_runtime/runtime.rs +++ b/kernel/src/process_runtime/runtime.rs @@ -2,12 +2,8 @@ use cpuarch::vmsa::VMSA; use igvm_defs::PAGE_SIZE_4K; use core::ffi::CStr; use core::str; -<<<<<<< HEAD -use crate::{address::VirtAddr, cpu::{cpuid::{cpuid_table_raw, CpuidResult}, percpu::{this_cpu, this_cpu_unsafe}}, map_paddr, mm::{PerCPUPageMappingGuard, PAGE_SIZE}, paddr_as_slice, process_manager::{process::{ProcessID, TrustedProcess, PROCESS_STORE}, process_memory::allocate_page, process_paging::{GraminePalProtFlags, ProcessPageFlags, ProcessPageTableRef}}, protocols::{errors::SvsmReqError, RequestParams}}; use crate::process_manager::process_paging::TP_LIBOS_START_VADDR; -======= -use crate::{address::VirtAddr, cpu::{cpuid::{cpuid_table_raw, CpuidResult}, percpu::{this_cpu, this_cpu_unsafe}}, map_paddr, mm::{PerCPUPageMappingGuard, PAGE_SIZE}, paddr_as_slice, process_manager::{process::{ProcessID, TrustedProcess, PROCESS_STORE}, process_memory::allocate_page, process_paging::{ProcessPageFlags, ProcessPageTableRef}}, protocols::{errors::SvsmReqError, RequestParams}, vaddr_as_u64_slice}; ->>>>>>> 145f83e (Add result call for Trustlet) +use crate::{address::VirtAddr, cpu::{cpuid::{cpuid_table_raw, CpuidResult}, percpu::{this_cpu, this_cpu_unsafe}}, map_paddr, mm::{PerCPUPageMappingGuard, PAGE_SIZE}, paddr_as_slice, process_manager::{process::{ProcessID, TrustedProcess, PROCESS_STORE}, process_memory::allocate_page, process_paging::{GraminePalProtFlags, ProcessPageFlags, ProcessPageTableRef}}, protocols::{errors::SvsmReqError, RequestParams}, vaddr_as_u64_slice}; use crate::vaddr_as_slice; use crate::types::PageSize; @@ -98,12 +94,8 @@ pub fn invoke_trustlet(params: &mut RequestParams) -> Result<(), SvsmReqError> { break; } } -<<<<<<< HEAD -======= - params.rcx = rc.return_value; ->>>>>>> 145f83e (Add result call for Trustlet) Ok(()) }