mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-03 13:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce logging for debug purposes

Browse Source
This commit is contained in:
Alex Zenla
2024-01-11 12:21:33 -08:00
parent 2e4f688916
commit 684a7d1f62
14 changed files with 127 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xenclient/src/boot.rs
View File

@ -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)
}
}

21
xenclient/src/elfloader.rs
View File

@ -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);
}
}