External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-23 03:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch, qcow: Fix 1.42.0 clippy warnings

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2020-03-13 12:14:09 +01:00 committed by Rob Bradford
parent 6ea85ca86c
commit 134e64c612
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/src/x86_64/gdt.rs
View File

@ -11,17 +11,17 @@ use kvm_bindings::kvm_segment;
/// Constructor for a conventional segment GDT (or LDT) entry. Derived from the kernel's segment.h. /// Constructor for a conventional segment GDT (or LDT) entry. Derived from the kernel's segment.h.
pub fn gdt_entry(flags: u16, base: u32, limit: u32) -> u64 { pub fn gdt_entry(flags: u16, base: u32, limit: u32) -> u64 {
((((base as u64) & 0xff000000u64) << (56 - 24)) (((base as u64) & 0xff000000u64) << (56 - 24))
| (((flags as u64) & 0x0000f0ffu64) << 40) | (((flags as u64) & 0x0000f0ffu64) << 40)
| (((limit as u64) & 0x000f0000u64) << (48 - 16)) | (((limit as u64) & 0x000f0000u64) << (48 - 16))
| (((base as u64) & 0x00ffffffu64) << 16) | (((base as u64) & 0x00ffffffu64) << 16)
| ((limit as u64) & 0x0000ffffu64)) | ((limit as u64) & 0x0000ffffu64)
} }
fn get_base(entry: u64) -> u64 { fn get_base(entry: u64) -> u64 {
((((entry) & 0xFF00000000000000) >> 32) (((entry) & 0xFF00000000000000) >> 32)
| (((entry) & 0x000000FF00000000) >> 16) | (((entry) & 0x000000FF00000000) >> 16)
| (((entry) & 0x00000000FFFF0000) >> 16)) | (((entry) & 0x00000000FFFF0000) >> 16)
} }
fn get_limit(entry: u64) -> u32 { fn get_limit(entry: u64) -> u32 {

2
arch/src/x86_64/interrupts.rs
View File

@ -55,7 +55,7 @@ fn set_klapic_reg(klapic: &mut kvm_lapic_state, reg_offset: usize, value: u32) {
} }
fn set_apic_delivery_mode(reg: u32, mode: u32) -> u32 { fn set_apic_delivery_mode(reg: u32, mode: u32) -> u32 {
(((reg) & !0x700) | ((mode) << 8)) ((reg) & !0x700) | ((mode) << 8)
} }
/// Configures LAPICs. LAPIC0 is set for external interrupts, LAPIC1 is set for NMI. /// Configures LAPICs. LAPIC0 is set for external interrupts, LAPIC1 is set for NMI.

2
qcow/src/vec_cache.rs
View File

@ -120,7 +120,7 @@ impl<T: Cacheable> CacheMap<T> {
{ {
if self.map.len() == self.capacity { if self.map.len() == self.capacity {
// TODO(dgreid) - smarter eviction strategy. // TODO(dgreid) - smarter eviction strategy.
let to_evict = *self.map.iter().nth(0).unwrap().0; let to_evict = *self.map.iter().next().unwrap().0;
if let Some(evicted) = self.map.remove(&to_evict) { if let Some(evicted) = self.map.remove(&to_evict) {
if evicted.dirty() { if evicted.dirty() {
write_callback(to_evict, evicted)?; write_callback(to_evict, evicted)?;