External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-23 21:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: vhdx: adjust calculate_checksum

Browse Source 
It doesn't need to be public. None of its code path returns an error.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2024-12-24 20:20:33 +00:00 committed by Rob Bradford
parent 8f8d3c0139
commit 4ea4391f45
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/src/vhdx/vhdx_header.rs
View File

@ -142,7 +142,7 @@ impl Header {
return Err(VhdxHeaderError::InvalidHeaderSign); return Err(VhdxHeaderError::InvalidHeaderSign);
} }
let new_checksum = calculate_checksum(&mut buffer, size_of::<u32>())?; let new_checksum = calculate_checksum(&mut buffer, size_of::<u32>());
if header.checksum != new_checksum { if header.checksum != new_checksum {
return Err(VhdxHeaderError::InvalidChecksum(String::from("Header"))); return Err(VhdxHeaderError::InvalidChecksum(String::from("Header")));
} }
@ -231,7 +231,7 @@ impl RegionTableHeader {
return Err(VhdxHeaderError::InvalidRegionSign); return Err(VhdxHeaderError::InvalidRegionSign);
} }
let new_checksum = calculate_checksum(&mut buffer, size_of::<u32>())?; let new_checksum = calculate_checksum(&mut buffer, size_of::<u32>());
if region_table_header.checksum != new_checksum { if region_table_header.checksum != new_checksum {
return Err(VhdxHeaderError::InvalidChecksum(String::from("Region"))); return Err(VhdxHeaderError::InvalidChecksum(String::from("Region")));
} }
@ -456,7 +456,7 @@ impl VhdxHeader {
/// Therefore, before calculating, the existing checksum is retrieved and the /// Therefore, before calculating, the existing checksum is retrieved and the
/// corresponding field is made zero. After the calculation, the existing checksum /// corresponding field is made zero. After the calculation, the existing checksum
/// is put back to the buffer. /// is put back to the buffer.
pub fn calculate_checksum(buffer: &mut [u8], csum_offset: usize) -> Result<u32> { fn calculate_checksum(buffer: &mut [u8], csum_offset: usize) -> u32 {
// Read the original checksum from the buffer // Read the original checksum from the buffer
let orig_csum = LittleEndian::read_u32(&buffer[csum_offset..csum_offset + 4]); let orig_csum = LittleEndian::read_u32(&buffer[csum_offset..csum_offset + 4]);
// Zero the checksum in the buffer // Zero the checksum in the buffer
@ -469,5 +469,5 @@ pub fn calculate_checksum(buffer: &mut [u8], csum_offset: usize) -> Result<u32>
// Put back the original checksum in the buffer // Put back the original checksum in the buffer
LittleEndian::write_u32(&mut buffer[csum_offset..csum_offset + 4], orig_csum); LittleEndian::write_u32(&mut buffer[csum_offset..csum_offset + 4], orig_csum);
Ok(new_csum) new_csum
} }