kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: treewide: clippy: collapse nested ifs, use let chains

Browse Source 
This bumps the MSRV to 1.88 (also, Rust edition 2024 is mandatory).

Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
This commit is contained in:
Philipp Schuster
2025-08-15 09:00:01 +02:00
committed by Bo Chen
parent f73a6c8d8e
commit c995b72384
40 changed files with 574 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hypervisor/src/arch/x86/emulator/mod.rs
View File

@@ -624,11 +624,11 @@ impl<T: CpuStateManager> Emulator<'_, T> {
last_decoded_ip = decoder.ip();
num_insn_emulated += 1;
if let Some(num_insn) = num_insn {
if num_insn_emulated >= num_insn {
// Exit the decoding loop, do not decode the next instruction.
stop_emulation = true;
}
if let Some(num_insn) = num_insn
&& num_insn_emulated >= num_insn
{
// Exit the decoding loop, do not decode the next instruction.
stop_emulation = true;
}
}

24
hypervisor/src/mshv/x86_64/emulator.rs
View File

@@ -44,12 +44,12 @@ impl MshvEmulatorContext<'_> {
gpa
);
if let Some(vm_ops) = &self.vcpu.vm_ops {
if vm_ops.guest_mem_read(gpa, data).is_err() {
vm_ops
.mmio_read(gpa, data)
.map_err(|e| PlatformError::MemoryReadFailure(e.into()))?;
}
if let Some(vm_ops) = &self.vcpu.vm_ops
&& vm_ops.guest_mem_read(gpa, data).is_err()
{
vm_ops
.mmio_read(gpa, data)
.map_err(|e| PlatformError::MemoryReadFailure(e.into()))?;
}
Ok(())
@@ -94,12 +94,12 @@ impl MshvEmulatorContext<'_> {
gpa
);
if let Some(vm_ops) = &self.vcpu.vm_ops {
if vm_ops.guest_mem_write(gpa, data).is_err() {
vm_ops
.mmio_write(gpa, data)
.map_err(|e| PlatformError::MemoryWriteFailure(e.into()))?;
}
if let Some(vm_ops) = &self.vcpu.vm_ops
&& vm_ops.guest_mem_write(gpa, data).is_err()
{
vm_ops
.mmio_write(gpa, data)
.map_err(|e| PlatformError::MemoryWriteFailure(e.into()))?;
}
Ok(())