From c36a39127187826bb0e29805482d2cb68ac676bf Mon Sep 17 00:00:00 2001 From: OuyangHang33 Date: Mon, 17 Jun 2024 13:48:57 +0800 Subject: [PATCH] Use addr_of! macro instead of & Signed-off-by: OuyangHang33 --- tdx-tdcall/src/tdx.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tdx-tdcall/src/tdx.rs b/tdx-tdcall/src/tdx.rs index 4cd246bf..2acad227 100644 --- a/tdx-tdcall/src/tdx.rs +++ b/tdx-tdcall/src/tdx.rs @@ -234,7 +234,7 @@ pub fn tdvmcall_io_write_32(port: u16, byte: u32) { pub fn tdvmcall_mmio_write(address: *const T, value: T) { let address = address as u64 | *SHARED_MASK; fence(Ordering::SeqCst); - let val = unsafe { *(&value as *const T as *const u64) }; + let val = unsafe { *(core::ptr::addr_of!(value) as *const u64) }; let mut args = TdVmcallArgs { r11: TDVMCALL_MMIO, @@ -273,7 +273,7 @@ pub fn tdvmcall_mmio_read(address: usize) -> T { tdvmcall_halt(); } - unsafe { *(&args.r11 as *const u64 as *const T) } + unsafe { *(core::ptr::addr_of!(args.r11) as *const T) } } /// Used to request the host VMM to map a GPA range as a private or shared memory mappings. @@ -514,7 +514,7 @@ pub fn tdcall_get_td_info() -> Result { /// /// Details can be found in TDX Module ABI spec section 'TDG.VP.INFO Leaf' pub fn tdcall_extend_rtmr(digest: &TdxDigest, mr_index: u32) -> Result<(), TdCallError> { - let buffer: u64 = &digest.data as *const u8 as u64; + let buffer: u64 = core::ptr::addr_of!(digest.data) as u64; let mut args = TdcallArgs { rax: TDCALL_TDEXTENDRTMR,