add prints and host check

Author: chris-oo

openhcl/openhcl_boot/src/host_params/dt.rs

@@ -578,6 +578,8 @@ fn topology_from_persisted_state(
     ALLOCATOR.disable_alloc();
     ALLOCATOR.log_stats();
 
+    log!("read saved state {:#x?}", parsed_protobuf);
+
     let loader_defs::shim::SavedState {
         partition_memory,
         partition_mmio,
@@ -622,6 +624,19 @@ fn topology_from_persisted_state(
         }),
     );
 
+    log!("restored vtl2 ram {:#x?}", vtl2_ram.as_slice());
+
+    // If the host was responsible for allocating VTL2 ram, verify the ram
+    // parsed from the previous instance matches.
+    if matches!(memory_allocation_mode, MemoryAllocationMode::Host) {
+        let host_vtl2_ram = parse_host_vtl2_ram(params, &parsed.memory);
+        assert_eq!(
+            vtl2_ram.as_slice(),
+            host_vtl2_ram.as_ref(),
+            "vtl2 ram from persisted state does not match host provided ram"
+        );
+    }
+
     // Merge the persisted state header and protobuf region, and report that as
     // the persisted region.
     //

openhcl/openhcl_boot/src/main.rs

@@ -526,7 +526,6 @@ fn shim_main(shim_params_raw_offset: isize) -> ! {
     }
 
     // Enable the in-memory log.
-    boot_logger_init(p.isolation_type, true);
     boot_logger_memory_init(p.log_buffer);
 
     let boot_reftime = get_ref_time(p.isolation_type);