External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: Update for beta clippy failures on x86-64

Browse Source 
Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2023-05-30 10:58:05 +01:00 committed by Bo Chen
parent 5ac68534b1
commit 89e658d9ff
7 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tpm/src/emulator.rs
View File

@ -309,11 +309,7 @@ impl Emulator {
} }
self.established_flag_cached = true; self.established_flag_cached = true;
if est.resp.bit != 0 { self.established_flag = est.resp.bit == 0;
self.established_flag = false;
} else {
self.established_flag = true;
}
self.established_flag self.established_flag
} }

6
vhdx/src/vhdx_metadata.rs
View File

@ -145,11 +145,7 @@ impl DiskSpec {
let bits = f let bits = f
.read_u32::<LittleEndian>() .read_u32::<LittleEndian>()
.map_err(VhdxMetadataError::ReadMetadata)?; .map_err(VhdxMetadataError::ReadMetadata)?;
if bits & BLOCK_HAS_PARENT != 0 { disk_spec.has_parent = bits & BLOCK_HAS_PARENT != 0;
disk_spec.has_parent = true;
} else {
disk_spec.has_parent = false;
}
metadata_presence |= METADATA_FILE_PARAMETER_PRESENT; metadata_presence |= METADATA_FILE_PARAMETER_PRESENT;
} else if metadata_entry.item_id } else if metadata_entry.item_id

2
virtio-devices/src/vhost_user/fs.rs
View File

@ -605,7 +605,7 @@ impl VirtioDevice for Fs {
&mut self, &mut self,
shm_regions: VirtioSharedMemoryList, shm_regions: VirtioSharedMemoryList,
) -> std::result::Result<(), crate::Error> { ) -> std::result::Result<(), crate::Error> {
if let Some(mut cache) = self.cache.as_mut() { if let Some(cache) = self.cache.as_mut() {
cache.0 = shm_regions; cache.0 = shm_regions;
Ok(()) Ok(())
} else { } else {

3
vm-device/src/bus.rs
View File

@ -110,8 +110,7 @@ impl Bus {
let devices = self.devices.read().unwrap(); let devices = self.devices.read().unwrap();
let (range, dev) = devices let (range, dev) = devices
.range(..=BusRange { base: addr, len: 1 }) .range(..=BusRange { base: addr, len: 1 })
.rev() .next_back()?;
.next()?;
dev.upgrade().map(|d| (*range, d.clone())) dev.upgrade().map(|d| (*range, d.clone()))
} }

2
vmm/src/cpu.rs
View File

@ -1131,7 +1131,7 @@ impl CpuManager {
fn remove_vcpu(&mut self, cpu_id: u8) -> Result<()> { fn remove_vcpu(&mut self, cpu_id: u8) -> Result<()> {
info!("Removing vCPU: cpu_id = {}", cpu_id); info!("Removing vCPU: cpu_id = {}", cpu_id);
let mut state = &mut self.vcpu_states[usize::from(cpu_id)]; let state = &mut self.vcpu_states[usize::from(cpu_id)];
state.kill.store(true, Ordering::SeqCst); state.kill.store(true, Ordering::SeqCst);
state.signal_thread(); state.signal_thread();
state.join_thread()?; state.join_thread()?;

2
vmm/src/memory_manager.rs
View File

@ -1501,7 +1501,7 @@ impl MemoryManager {
.ok_or(Error::MemoryRangeAllocation)?; .ok_or(Error::MemoryRangeAllocation)?;
// Update the slot so that it can be queried via the I/O port // Update the slot so that it can be queried via the I/O port
let mut slot = &mut self.hotplug_slots[self.next_hotplug_slot]; let slot = &mut self.hotplug_slots[self.next_hotplug_slot];
slot.active = true; slot.active = true;
slot.inserting = true; slot.inserting = true;
slot.base = region.start_addr().0; slot.base = region.start_addr().0;

2
vmm/src/vm.rs
View File

@ -1258,7 +1258,7 @@ impl Vm {
.resize(desired_memory) .resize(desired_memory)
.map_err(Error::MemoryManager)?; .map_err(Error::MemoryManager)?;
let mut memory_config = &mut self.config.lock().unwrap().memory; let memory_config = &mut self.config.lock().unwrap().memory;
if let Some(new_region) = &new_region { if let Some(new_region) = &new_region {
self.device_manager self.device_manager