github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 01:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8345 from beraldoleal/issues/8343

Browse Source 
Fixes make check errors
This commit is contained in:
Greg Kurz
2023-11-17 17:38:29 +01:00
committed by GitHub
parent f8322ffad2 afec54799e
commit 110574353d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/kata-sys-util/src/protection.rs
View File

@@ -152,7 +152,7 @@ pub fn arch_guest_protection(
let major_version_str = major_version_str.trim_start_matches(HEX_PREFIX); let major_version_str = major_version_str.trim_start_matches(HEX_PREFIX);
let major_version = u32::from_str_radix(&major_version_str, HEX_BASE) let major_version = u32::from_str_radix(major_version_str, HEX_BASE)
.map_err(|e| ProtectionError::FileInvalid(major_file, anyhow!(e)))?; .map_err(|e| ProtectionError::FileInvalid(major_file, anyhow!(e)))?;
let minor_version_str = std::fs::read_to_string(minor_file.clone()).map_err(|e| { let minor_version_str = std::fs::read_to_string(minor_file.clone()).map_err(|e| {
@@ -161,7 +161,7 @@ pub fn arch_guest_protection(
let minor_version_str = minor_version_str.trim_start_matches(HEX_PREFIX); let minor_version_str = minor_version_str.trim_start_matches(HEX_PREFIX);
let minor_version = u32::from_str_radix(&minor_version_str, HEX_BASE) let minor_version = u32::from_str_radix(minor_version_str, HEX_BASE)
.map_err(|e| ProtectionError::FileInvalid(minor_file, anyhow!(e)))?; .map_err(|e| ProtectionError::FileInvalid(minor_file, anyhow!(e)))?;
let details = TDXDetails { let details = TDXDetails {

10
src/libs/kata-types/src/config/shared_mount.rs
View File

@@ -36,19 +36,19 @@ pub struct SharedMount {
impl SharedMount { impl SharedMount {
pub fn validate(&self) -> Result<()> { pub fn validate(&self) -> Result<()> {
if self.name == "" { if self.name.is_empty() {
return Err(eother!("shared_mount: field 'name' couldn't be empty.")); return Err(eother!("shared_mount: field 'name' couldn't be empty."));
} }
if self.src_ctr == "" { if self.src_ctr.is_empty() {
return Err(eother!("shared_mount: field 'src_ctr' couldn't be empty.")); return Err(eother!("shared_mount: field 'src_ctr' couldn't be empty."));
} }
if self.dst_ctr == "" { if self.dst_ctr.is_empty() {
return Err(eother!("shared_mount: field 'dst_ctr' couldn't be empty.")); return Err(eother!("shared_mount: field 'dst_ctr' couldn't be empty."));
} }
if self.src_path == "" { if self.src_path.is_empty() {
return Err(eother!("shared_mount: field 'src_path' couldn't be empty.")); return Err(eother!("shared_mount: field 'src_path' couldn't be empty."));
} }
if self.dst_path == "" { if self.dst_path.is_empty() {
return Err(eother!("shared_mount: field 'dst_path' couldn't be empty.")); return Err(eother!("shared_mount: field 'dst_path' couldn't be empty."));
} }