tdcall hypercall changes

Author: babayet2

openhcl/openhcl_boot/src/arch/x86_64/tdx.rs

@@ -24,7 +24,6 @@ use tdx_guest_device::protocol::TdReport;
 use x86defs::X64_LARGE_PAGE_SIZE;
 use x86defs::tdx::RESET_VECTOR_PAGE;
 use x86defs::tdx::TdCallResult;
-use x86defs::tdx::TdVmCallR10Result;
 
 /// Writes a synthehtic register to tell the hypervisor the OS ID for the boot shim.
 fn report_os_id(guest_os_id: u64) {
@@ -157,14 +156,7 @@ pub fn invoke_tdcall_hypercall(
     control: hvdef::hypercall::Control,
     io: &TdxHypercallPage,
 ) -> hvdef::hypercall::HypercallOutput {
-    let result = tdcall_hypercall(&mut TdcallInstruction, control, io.input(), io.output());
-    match result {
-        Ok(()) => 0.into(),
-        Err(val) => {
-            let TdVmCallR10Result(return_code) = val;
-            return_code.into()
-        }
-    }
+    tdcall_hypercall(&mut TdcallInstruction, control, io.input(), io.output())
 }
 
 /// Global variable to store tsc frequency.

vm/x86/tdcall/src/lib.rs

@@ -7,6 +7,7 @@
 #![forbid(unsafe_code)]
 
 use hvdef::HV_PAGE_SIZE;
+use hvdef::hypercall::HypercallOutput;
 use memory_range::MemoryRange;
 use tdx_guest_device::protocol::TdReport;
 use thiserror::Error;
@@ -86,7 +87,7 @@ pub fn tdcall_hypercall(
     control: hvdef::hypercall::Control,
     input_gpa: u64,
     output_gpa: u64,
-) -> Result<(), TdVmCallR10Result> {
+) -> HypercallOutput {
     let input = TdcallInput {
         leaf: TdCallLeaf::VP_VMCALL,
         rcx: 0x0d04, // pass RDX, R8, R10, R11
@@ -114,12 +115,7 @@ pub fn tdcall_hypercall(
     }
 
     // TD.VMCALL for Hypercall passes return code in r11
-    let result = TdVmCallR10Result(output.r11);
-
-    match result {
-        TdVmCallR10Result::SUCCESS => Ok(()),
-        val => Err(val),
-    }
+    HypercallOutput::from(output.r11)
 }
 
 /// Perform a tdcall based MSR read. This is done by issuing a TDG.VP.VMCALL.