introduce logging for debug purposes

xenclient/Cargo.toml

@@ -11,6 +11,7 @@ flate2 = "1.0"
 xz2 = "0.1"
 memchr = "2"
 slice-copy = "0.3.0"
+log = "0.4.20"
 
 [dependencies.xencall]
 path = "../xencall"
@@ -22,6 +23,9 @@ path = "../xenstore"
 version = "1.6.1"
 features = ["v4"]
 
+[dev-dependencies]
+env_logger = "0.10.1"
+
 [lib]
 path = "src/lib.rs"
 

xenclient/examples/boot.rs

@@ -8,6 +8,8 @@ use xenclient::elfloader::ElfImageLoader;
 use xenclient::XenClientError;
 
 fn main() -> Result<(), XenClientError> {
+    env_logger::init();
+
     let args: Vec<String> = env::args().collect();
     if args.len() != 2 {
         println!("usage: boot <kernel-image>");

xenclient/examples/simple.rs

@@ -2,6 +2,8 @@ use xenclient::create::{DomainConfig, PvDomainConfig};
 use xenclient::{XenClient, XenClientError};
 
 fn main() -> Result<(), XenClientError> {
+    env_logger::init();
+
     let mut client = XenClient::open()?;
     let mut config = DomainConfig::new();
     config.configure_cpus(1);

xenclient/src/boot.rs

@@ -4,6 +4,7 @@ use crate::sys::{
 };
 use crate::XenClientError;
 use libc::memset;
+use log::debug;
 use std::ffi::c_void;
 use std::slice;
 use xencall::domctl::DomainControl;
@@ -184,11 +185,17 @@ impl BootSetup<'_> {
         image_loader: &dyn BootImageLoader,
         memkb: u64,
     ) -> Result<(), XenClientError> {
+        debug!("BootSetup initialize memkb={:?}", memkb);
         let image_info = image_loader.parse()?;
+        debug!("BootSetup initialize image_info={:?}", image_info);
         self.domctl.set_max_mem(self.domid, memkb)?;
         self.initialize_memory(memkb)?;
         let kernel_segment = self.alloc_segment(image_info.virt_kend - image_info.virt_kstart)?;
         let kernel_segment_ptr = kernel_segment.addr as *mut u8;
+        debug!(
+            "BootSetup initialize kernel_segment ptr={:#x}",
+            kernel_segment_ptr as u64
+        );
         let slice =
             unsafe { slice::from_raw_parts_mut(kernel_segment_ptr, kernel_segment.size as usize) };
         image_loader.load(image_info, slice)?;
@@ -215,6 +222,7 @@ impl BootSetup<'_> {
         self.virt_alloc_end += pages * page_size;
         segment._vend = self.virt_alloc_end;
         self.pfn_alloc_end += 1;
+        debug!("BootSetup alloc_segment size={} ptr={:#x}", size, ptr);
         Ok(segment)
     }
 }

xenclient/src/elfloader.rs

@@ -9,6 +9,7 @@ use elf::endian::AnyEndian;
 use elf::note::Note;
 use elf::{ElfBytes, ParseError};
 use flate2::bufread::GzDecoder;
+use log::debug;
 use memchr::memmem::find_iter;
 use slice_copy::copy;
 use std::collections::HashMap;
@@ -300,6 +301,11 @@ impl BootImageLoader for ElfImageLoader {
             "Unable to parse kernel image: segments not found.",
         ))?;
 
+        debug!(
+            "ElfImageLoader load dst={:#x} segments={}",
+            dst.as_ptr() as u64,
+            segments.len()
+        );
         for header in segments {
             let paddr = header.p_paddr;
             let filesz = header.p_filesz;
@@ -307,9 +313,22 @@ impl BootImageLoader for ElfImageLoader {
             let base_offset = paddr - image_info.virt_kstart;
             let data = elf.segment_data(&header)?;
             let segment_dst = &mut dst[base_offset as usize..];
-            copy(segment_dst, &data[0..filesz as usize]);
+            let copy_slice = &data[0..filesz as usize];
+            debug!(
+                "ElfImageLoader load copy hdr={:?} dst={:#x} len={}",
+                header,
+                copy_slice.as_ptr() as u64,
+                copy_slice.len()
+            );
+            copy(segment_dst, copy_slice);
             if memsz - filesz > 0 {
                 let remaining = &mut segment_dst[filesz as usize..(memsz - filesz) as usize];
+                debug!(
+                    "ElfImageLoader load fill_zero hdr={:?} dst={:#x} len={}",
+                    header.p_offset,
+                    remaining.as_ptr() as u64,
+                    remaining.len()
+                );
                 remaining.fill(0);
             }
         }