Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coverage_config_x86_64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"coverage_score": 80.8,
"coverage_score": 81.1,
"exclude_path": "",
"crate_features": "bzimage,elf",
"exclude_path": "benches/,loader_gen/"
Expand Down
2 changes: 1 addition & 1 deletion rust-vmm-ci
6 changes: 3 additions & 3 deletions src/cmdline/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,9 @@ impl Cmdline {
}
}

impl Into<Vec<u8>> for Cmdline {
fn into(self) -> Vec<u8> {
self.line.into_bytes()
impl From<Cmdline> for Vec<u8> {
fn from(cmdline: Cmdline) -> Vec<u8> {
cmdline.line.into_bytes()
}
}

Expand Down
8 changes: 5 additions & 3 deletions src/loader/x86_64/bzimage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,11 @@ impl KernelLoader for BzImage {

boot_header.code32_start = mem_offset.raw_value() as u32;

let mut loader_result: KernelLoaderResult = Default::default();
loader_result.setup_header = Some(boot_header);
loader_result.kernel_load = mem_offset;
let mut loader_result = KernelLoaderResult {
setup_header: Some(boot_header),
kernel_load: mem_offset,
..Default::default()
};

// Seek the compressed `vmlinux.bin` and read it to memory.
kernel_image
Expand Down
22 changes: 11 additions & 11 deletions src/loader/x86_64/elf/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,17 @@ impl KernelLoader for Elf {
}
}

let mut loader_result: KernelLoaderResult = Default::default();

// Address where the kernel will be loaded.
loader_result.kernel_load = match kernel_offset {
Some(k_offset) => GuestAddress(
k_offset
.raw_value()
.checked_add(ehdr.e_entry as u64)
.ok_or(Error::Overflow)?,
),
None => GuestAddress(ehdr.e_entry as u64),
let mut loader_result = KernelLoaderResult {
kernel_load: match kernel_offset {
Some(k_offset) => GuestAddress(
k_offset
.raw_value()
.checked_add(ehdr.e_entry as u64)
.ok_or(Error::Overflow)?,
),
None => GuestAddress(ehdr.e_entry as u64),
},
..Default::default()
};

kernel_image
Expand Down