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

more hvm work

Browse Source
This commit is contained in:
Alex Zenla
2024-05-07 17:56:06 -07:00
parent 7dfd38fca9
commit 29b3f91e60
5 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/xen/xenclient/examples/boot.rs
View File

@ -20,10 +20,10 @@ async fn main() -> Result<()> {
backend_domid: 0,
name: "xenclient-test".to_string(),
max_vcpus: 1,
mem_mb: 300,
mem_mb: 512,
kernel: fs::read(&kernel_image_path).await?,
initrd: fs::read(&initrd_path).await?,
cmdline: "debug elevator=noop earlyprintk=xen".to_string(),
cmdline: "console=hvc0 debug earlyprintk=xen,keep loglevel=10".to_string(),
swap_console_backend: None,
disks: vec![],
channels: vec![],

2
crates/xen/xenclient/src/lib.rs
View File

@ -362,7 +362,7 @@ impl XenClient {
.clone()
.unwrap_or("xenconsoled".to_string())
.to_string(),
initialized: false,
initialized: true,
},
&dom_path,
&backend_dom_path,

5
crates/xen/xenclient/src/x86acpi.rs
View File

@ -5,7 +5,10 @@
non_snake_case,
non_upper_case_globals,
unused_assignments,
unused_mut
unused_mut,
static_mut_refs,
clippy::single_match,
clippy::unnecessary_cast
)]
use std::ptr::addr_of_mut;

24
crates/xen/xenclient/src/x86pvh.rs
View File

@ -288,7 +288,7 @@ impl X86PvhPlatform {
}
ptr = ptr
.add(size_of::<HvmSaveDescriptor>())
.add((*sd).length as usize) as *mut u8;
.add((*sd).length as usize);
}
std::ptr::null_mut()
}
@ -630,7 +630,7 @@ impl BootSetupPlatform for X86PvhPlatform {
let mut start_info_size = size_of::<HvmStartInfo>();
start_info_size += domain.cmdline.len() + 1;
start_info_size += size_of::<E820Entry>() * memmap.len();
start_info_size += size_of::<HvmMemmapTableEntry>() * memmap.len();
self.start_info_segment = Some(domain.alloc_segment(0, start_info_size as u64).await?);
let pt = domain
@ -657,7 +657,10 @@ impl BootSetupPlatform for X86PvhPlatform {
)
.await?;
domain.consoles.push((0, special_pfn(SPECIALPAGE_CONSOLE)));
let evtchn = domain.call.evtchn_alloc_unbound(domain.domid, 0).await?;
domain
.consoles
.push((evtchn, special_pfn(SPECIALPAGE_CONSOLE)));
domain.store_mfn = special_pfn(SPECIALPAGE_XENSTORE);
Ok(())
@ -673,9 +676,16 @@ impl BootSetupPlatform for X86PvhPlatform {
.start_info_segment
.as_ref()
.ok_or_else(|| Error::GenericError("start_info_segment missing".to_string()))?;
let ptr = domain.phys.pfn_to_ptr(start_info_segment.pfn, 1).await?;
let byte_slice =
unsafe { slice::from_raw_parts_mut(ptr as *mut u8, X86_PAGE_SIZE as usize) };
let ptr = domain
.phys
.pfn_to_ptr(start_info_segment.pfn, start_info_segment.pages)
.await?;
let byte_slice = unsafe {
slice::from_raw_parts_mut(
ptr as *mut u8,
(self.page_size() * start_info_segment.pages) as usize,
)
};
byte_slice.fill(0);
let info = ptr as *mut HvmStartInfo;
unsafe {
@ -886,7 +896,7 @@ unsafe extern "C" fn acpi_mem_free(_: *mut acpi_ctxt, _: *mut libc::c_void, _: u
unsafe extern "C" fn acpi_v2p(ctxt: *mut acpi_ctxt, v: *mut c_void) -> libc::c_ulong {
let ctx = (*ctxt).ptr as *mut AcpiBuildContext;
(*ctx).guest_start + (v.sub((*ctx).buf as usize) as u64)
(*ctx).guest_start + (v as u64 - ((*ctx).buf as u64))
}
#[repr(C)]