commit 9ae9ba0ba861b14aa46abf09b0442749159244c1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 17 17:18:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 17 17:18:41 2023 +0000
tree 53e6192827afbed51e4c19c55ddc71ccfe0367cc
parent b44562473002136b560af10b42f3103949176069
parent 8036b4f91eed066ab2ea51a09dae3ae708e61db0

Merge "pvmfw: Use Fdt::as_ptr() during logging"

libs/libfdt/src/lib.rs

diff --git a/libs/libfdt/src/lib.rs b/libs/libfdt/src/lib.rs
index 29d7abe..927bf50 100644
--- a/libs/libfdt/src/lib.rs
+++ b/libs/libfdt/src/lib.rs
@@ -614,7 +614,8 @@
         fdt_err_expect_zero(ret)
     }
 
-    fn as_ptr(&self) -> *const c_void {
+    /// Return a shared pointer to the device tree.
+    pub fn as_ptr(&self) -> *const c_void {
         self as *const _ as *const c_void
     }
 

pvmfw/src/main.rs

diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index ba26114..2e56597 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -63,7 +63,7 @@
     memory: &mut MemoryTracker,
 ) -> Result<(), RebootReason> {
     info!("pVM firmware");
-    debug!("FDT: {:?}", fdt as *const libfdt::Fdt);
+    debug!("FDT: {:?}", fdt.as_ptr());
     debug!("Signed kernel: {:?} ({:#x} bytes)", signed_kernel.as_ptr(), signed_kernel.len());
     debug!("AVB public key: addr={:?}, size={:#x} ({1})", PUBLIC_KEY.as_ptr(), PUBLIC_KEY.len());
     if let Some(rd) = ramdisk {