Merge changes Ic0f0f02d,I6c9f1a03
* changes:
Format entry register values as 64-bit hex.
Check that DTB address is as expected.
diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index 280e1ce..0d71f6e 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -27,7 +27,7 @@
pub fn main(fdt_address: u64, payload_start: u64, payload_size: u64, arg3: u64) {
println!("pVM firmware");
println!(
- "fdt_address={:#010x}, payload_start={:#010x}, payload_size={:#010x}, x3={:#010x}",
+ "fdt_address={:#018x}, payload_start={:#018x}, payload_size={:#018x}, x3={:#018x}",
fdt_address, payload_start, payload_size, arg3,
);
}
diff --git a/vmbase/example/src/main.rs b/vmbase/example/src/main.rs
index 99aca1d..3a1de08 100644
--- a/vmbase/example/src/main.rs
+++ b/vmbase/example/src/main.rs
@@ -50,8 +50,11 @@
/// Entry point for VM bootloader.
pub fn main(arg0: u64, arg1: u64, arg2: u64, arg3: u64) {
println!("Hello world");
- println!("x0={:#010x}, x1={:#010x}, x2={:#010x}, x3={:#010x}", arg0, arg1, arg2, arg3);
+ println!("x0={:#018x}, x1={:#018x}, x2={:#018x}, x3={:#018x}", arg0, arg1, arg2, arg3);
print_addresses();
+ unsafe {
+ assert_eq!(arg0, &dtb_begin as *const u8 as u64);
+ }
check_data();
unsafe {