mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-08-20 06:51:15 +00:00
arch: x86: Extract common bootparams settings
We're going to add more common settings, so let's avoid duplication between the 2 branches. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
28a5f9dc19
commit
ad354700c9
@ -304,18 +304,19 @@ fn configure_64bit_boot(
|
|||||||
let mut params: BootParamsWrapper = BootParamsWrapper(boot_params::default());
|
let mut params: BootParamsWrapper = BootParamsWrapper(boot_params::default());
|
||||||
|
|
||||||
if let Some(hdr) = setup_hdr {
|
if let Some(hdr) = setup_hdr {
|
||||||
|
// We should use the header if the loader provides one (e.g. from a bzImage).
|
||||||
params.0.hdr = hdr;
|
params.0.hdr = hdr;
|
||||||
params.0.hdr.cmd_line_ptr = cmdline_addr.raw_value() as u32;
|
|
||||||
params.0.hdr.cmdline_size = cmdline_size as u32;
|
|
||||||
} else {
|
} else {
|
||||||
params.0.hdr.type_of_loader = KERNEL_LOADER_OTHER;
|
params.0.hdr.type_of_loader = KERNEL_LOADER_OTHER;
|
||||||
params.0.hdr.boot_flag = KERNEL_BOOT_FLAG_MAGIC;
|
params.0.hdr.boot_flag = KERNEL_BOOT_FLAG_MAGIC;
|
||||||
params.0.hdr.header = KERNEL_HDR_MAGIC;
|
params.0.hdr.header = KERNEL_HDR_MAGIC;
|
||||||
params.0.hdr.cmd_line_ptr = cmdline_addr.raw_value() as u32;
|
|
||||||
params.0.hdr.cmdline_size = cmdline_size as u32;
|
|
||||||
params.0.hdr.kernel_alignment = KERNEL_MIN_ALIGNMENT_BYTES;
|
params.0.hdr.kernel_alignment = KERNEL_MIN_ALIGNMENT_BYTES;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Common bootparams settings
|
||||||
|
params.0.hdr.cmd_line_ptr = cmdline_addr.raw_value() as u32;
|
||||||
|
params.0.hdr.cmdline_size = cmdline_size as u32;
|
||||||
|
|
||||||
add_e820_entry(&mut params.0, 0, layout::EBDA_START.raw_value(), E820_RAM)?;
|
add_e820_entry(&mut params.0, 0, layout::EBDA_START.raw_value(), E820_RAM)?;
|
||||||
|
|
||||||
let mem_end = guest_mem.last_addr();
|
let mem_end = guest_mem.last_addr();
|
||||||
|
Loading…
Reference in New Issue
Block a user