diff --git a/acpi_tables/src/rsdp.rs b/acpi_tables/src/rsdp.rs index e5cbde057..16e95bd2c 100644 --- a/acpi_tables/src/rsdp.rs +++ b/acpi_tables/src/rsdp.rs @@ -36,7 +36,7 @@ impl Rsdp { }; rsdp.checksum = super::generate_checksum(&rsdp.as_slice()[0..19]); - rsdp.extended_checksum = super::generate_checksum(&rsdp.as_slice()); + rsdp.extended_checksum = super::generate_checksum(rsdp.as_slice()); rsdp } diff --git a/acpi_tables/src/sdt.rs b/acpi_tables/src/sdt.rs index e6e465ce4..a9e60a1da 100644 --- a/acpi_tables/src/sdt.rs +++ b/acpi_tables/src/sdt.rs @@ -75,7 +75,7 @@ impl Sdt { } pub fn as_slice(&self) -> &[u8] { - &self.data.as_slice() + self.data.as_slice() } pub fn append(&mut self, value: T) { diff --git a/arch/src/aarch64/fdt.rs b/arch/src/aarch64/fdt.rs index 1b74f4e61..c6a21a43e 100644 --- a/arch/src/aarch64/fdt.rs +++ b/arch/src/aarch64/fdt.rs @@ -196,7 +196,7 @@ fn create_gic_node(fdt: &mut FdtWriter, gic_device: &dyn GicDevice) -> FdtWriter // interrupt source. The type shall be a and the value shall be 3 if no PPI affinity description // is required. fdt.property_u32("#interrupt-cells", 3)?; - fdt.property_array_u64("reg", &gic_reg_prop)?; + fdt.property_array_u64("reg", gic_reg_prop)?; fdt.property_u32("phandle", GIC_PHANDLE)?; fdt.property_u32("#address-cells", 2)?; fdt.property_u32("#size-cells", 2)?; @@ -215,7 +215,7 @@ fn create_gic_node(fdt: &mut FdtWriter, gic_device: &dyn GicDevice) -> FdtWriter fdt.property_null("msi-controller")?; fdt.property_u32("phandle", MSI_PHANDLE)?; let msi_reg_prop = gic_device.msi_properties(); - fdt.property_array_u64("reg", &msi_reg_prop)?; + fdt.property_array_u64("reg", msi_reg_prop)?; fdt.end_node(msic_node)?; } diff --git a/arch/src/aarch64/gic/dist_regs.rs b/arch/src/aarch64/gic/dist_regs.rs index f5257fc9d..482e23abc 100644 --- a/arch/src/aarch64/gic/dist_regs.rs +++ b/arch/src/aarch64/gic/dist_regs.rs @@ -152,7 +152,7 @@ pub fn set_dist_regs(gic: &Arc, state: &[u32]) -> Result for dreg in VGIC_DIST_REGS { let mut base = dreg.base + REG_SIZE as u32 * dreg.bpi as u32; - let end = compute_reg_len(gic, &dreg, base)?; + let end = compute_reg_len(gic, dreg, base)?; while base < end { let val = state[idx]; @@ -169,7 +169,7 @@ pub fn get_dist_regs(gic: &Arc) -> Result> { for dreg in VGIC_DIST_REGS { let mut base = dreg.base + REG_SIZE as u32 * dreg.bpi as u32; - let end = compute_reg_len(gic, &dreg, base)?; + let end = compute_reg_len(gic, dreg, base)?; while base < end { let val: u32 = 0; diff --git a/arch/src/aarch64/gic/gicv3.rs b/arch/src/aarch64/gic/gicv3.rs index 681da6600..7716e34a9 100644 --- a/arch/src/aarch64/gic/gicv3.rs +++ b/arch/src/aarch64/gic/gicv3.rs @@ -107,19 +107,19 @@ pub mod kvm { /// Save the state of GIC. fn state(&self, gicr_typers: &[u64]) -> Result { // Flush redistributors pending tables to guest RAM. - save_pending_tables(&self.device()).map_err(Error::SavePendingTables)?; + save_pending_tables(self.device()).map_err(Error::SavePendingTables)?; let gicd_ctlr = - read_ctlr(&self.device()).map_err(Error::SaveDistributorCtrlRegisters)?; + read_ctlr(self.device()).map_err(Error::SaveDistributorCtrlRegisters)?; let dist_state = - get_dist_regs(&self.device()).map_err(Error::SaveDistributorRegisters)?; + get_dist_regs(self.device()).map_err(Error::SaveDistributorRegisters)?; - let rdist_state = get_redist_regs(&self.device(), &gicr_typers) + let rdist_state = get_redist_regs(self.device(), gicr_typers) .map_err(Error::SaveRedistributorRegisters)?; let icc_state = - get_icc_regs(&self.device(), &gicr_typers).map_err(Error::SaveIccRegisters)?; + get_icc_regs(self.device(), gicr_typers).map_err(Error::SaveIccRegisters)?; Ok(Gicv3State { dist: dist_state, @@ -131,16 +131,16 @@ pub mod kvm { /// Restore the state of GIC. fn set_state(&mut self, gicr_typers: &[u64], state: &Gicv3State) -> Result<()> { - write_ctlr(&self.device(), state.gicd_ctlr) + write_ctlr(self.device(), state.gicd_ctlr) .map_err(Error::RestoreDistributorCtrlRegisters)?; - set_dist_regs(&self.device(), &state.dist) + set_dist_regs(self.device(), &state.dist) .map_err(Error::RestoreDistributorRegisters)?; - set_redist_regs(&self.device(), gicr_typers, &state.rdist) + set_redist_regs(self.device(), gicr_typers, &state.rdist) .map_err(Error::RestoreRedistributorRegisters)?; - set_icc_regs(&self.device(), &gicr_typers, &state.icc) + set_icc_regs(self.device(), gicr_typers, &state.icc) .map_err(Error::RestoreIccRegisters)?; Ok(()) diff --git a/arch/src/aarch64/gic/redist_regs.rs b/arch/src/aarch64/gic/redist_regs.rs index 8f7d66d69..d730891f4 100644 --- a/arch/src/aarch64/gic/redist_regs.rs +++ b/arch/src/aarch64/gic/redist_regs.rs @@ -142,14 +142,14 @@ pub fn get_redist_regs(gic: &Arc, gicr_typer: &[u64]) -> let mut idx: usize = 0; access_redists_aux( gic, - &gicr_typer, + gicr_typer, &mut state, VGIC_RDIST_REGS, &mut idx, false, )?; - access_redists_aux(gic, &gicr_typer, &mut state, VGIC_SGI_REGS, &mut idx, false)?; + access_redists_aux(gic, gicr_typer, &mut state, VGIC_SGI_REGS, &mut idx, false)?; Ok(state) } diff --git a/block_util/src/lib.rs b/block_util/src/lib.rs index f57ad1661..3d2161886 100644 --- a/block_util/src/lib.rs +++ b/block_util/src/lib.rs @@ -187,8 +187,8 @@ impl Request { } let mut req = Request { - request_type: request_type(&mem, avail_desc.addr)?, - sector: sector(&mem, avail_desc.addr)?, + request_type: request_type(mem, avail_desc.addr)?, + sector: sector(mem, avail_desc.addr)?, data_descriptors: Vec::new(), status_addr: GuestAddress(0), writeback: true, @@ -288,7 +288,7 @@ impl Request { if (*data_len as usize) < disk_id.len() { return Err(ExecuteError::BadRequest(Error::InvalidOffset)); } - mem.write_slice(&disk_id.as_slice(), *data_addr) + mem.write_slice(disk_id.as_slice(), *data_addr) .map_err(ExecuteError::Write)?; } RequestType::Unsupported(t) => return Err(ExecuteError::Unsupported(t)), diff --git a/block_util/src/vhd.rs b/block_util/src/vhd.rs index 1d0cc98e9..b47ce90bf 100644 --- a/block_util/src/vhd.rs +++ b/block_util/src/vhd.rs @@ -175,7 +175,7 @@ mod tests { let mut disk_file: File = TempFile::new().unwrap().into_file(); disk_file.set_len(0x1000_0200).unwrap(); disk_file.seek(SeekFrom::Start(0x1000_0000)).unwrap(); - disk_file.write_all(&footer).unwrap(); + disk_file.write_all(footer).unwrap(); testfn(disk_file); // File closed when the function exits. } diff --git a/devices/src/legacy/gpio_pl061.rs b/devices/src/legacy/gpio_pl061.rs index 8121c9948..72ea05791 100644 --- a/devices/src/legacy/gpio_pl061.rs +++ b/devices/src/legacy/gpio_pl061.rs @@ -297,7 +297,7 @@ impl BusDevice for Gpio { fn write(&mut self, _base: u64, offset: u64, data: &[u8]) -> Option> { if data.len() <= 4 { - let value = read_le_u32(&data); + let value = read_le_u32(data); if let Err(e) = self.handle_write(offset, value) { warn!("Failed to write to GPIO PL061 device: {}", e); } diff --git a/devices/src/legacy/rtc_pl031.rs b/devices/src/legacy/rtc_pl031.rs index 18ea32b27..9d2f87b35 100644 --- a/devices/src/legacy/rtc_pl031.rs +++ b/devices/src/legacy/rtc_pl031.rs @@ -328,7 +328,7 @@ impl BusDevice for Rtc { fn write(&mut self, _base: u64, offset: u64, data: &[u8]) -> Option> { if data.len() <= 4 { - let v = read_le_u32(&data); + let v = read_le_u32(data); if let Err(e) = self.handle_write(offset, v) { warn!("Failed to write to RTC PL031 device: {}", e); } diff --git a/devices/src/legacy/uart_pl011.rs b/devices/src/legacy/uart_pl011.rs index 061f5cff8..fe2fa4800 100644 --- a/devices/src/legacy/uart_pl011.rs +++ b/devices/src/legacy/uart_pl011.rs @@ -341,7 +341,7 @@ impl BusDevice for Pl011 { fn write(&mut self, _base: u64, offset: u64, data: &[u8]) -> Option> { if data.len() <= 4 { - let v = read_le_u32(&data); + let v = read_le_u32(data); if let Err(e) = self.handle_write(offset, v) { warn!("Failed to write to PL011 device: {}", e); } diff --git a/hypervisor/src/arch/x86/emulator/mod.rs b/hypervisor/src/arch/x86/emulator/mod.rs index a9d7d91b4..d242f796a 100644 --- a/hypervisor/src/arch/x86/emulator/mod.rs +++ b/hypervisor/src/arch/x86/emulator/mod.rs @@ -678,7 +678,7 @@ mod mock_vmm { }; if let Some(mem) = memory { - vmm.write_memory(mem.0, &mem.1).unwrap(); + vmm.write_memory(mem.0, mem.1).unwrap(); } vmm @@ -693,7 +693,7 @@ mod mock_vmm { let ip = self.cpu_state(cpu_id).unwrap().ip(); let mut emulator = Emulator::new(self); - let new_state = emulator.emulate_insn_stream(cpu_id, &insn, num_insn)?; + let new_state = emulator.emulate_insn_stream(cpu_id, insn, num_insn)?; if num_insn.is_none() { assert_eq!(ip + insn.len() as u64, new_state.ip()); } diff --git a/hypervisor/src/kvm/mod.rs b/hypervisor/src/kvm/mod.rs index 112b49b18..b1b4b3cf8 100644 --- a/hypervisor/src/kvm/mod.rs +++ b/hypervisor/src/kvm/mod.rs @@ -226,7 +226,7 @@ impl vm::Vm for KvmVm { unsafe { let entries_slice: &mut [kvm_irq_routing_entry] = irq_routing[0].entries.as_mut_slice(entries.len()); - entries_slice.copy_from_slice(&entries); + entries_slice.copy_from_slice(entries); } self.fd @@ -801,7 +801,7 @@ impl cpu::Vcpu for KvmVcpu { /// fn set_xcrs(&self, xcrs: &ExtendedControlRegisters) -> cpu::Result<()> { self.fd - .set_xcrs(&xcrs) + .set_xcrs(xcrs) .map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into())) } /// diff --git a/hypervisor/src/mshv/mod.rs b/hypervisor/src/mshv/mod.rs index 59de7e82f..781d00d11 100644 --- a/hypervisor/src/mshv/mod.rs +++ b/hypervisor/src/mshv/mod.rs @@ -235,7 +235,7 @@ impl cpu::Vcpu for MshvVcpu { /// fn set_xcrs(&self, xcrs: &ExtendedControlRegisters) -> cpu::Result<()> { self.fd - .set_xcrs(&xcrs) + .set_xcrs(xcrs) .map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into())) } #[cfg(target_arch = "x86_64")] @@ -708,7 +708,7 @@ impl vm::Vm for MshvVm { debug!("register_irqfd fd {} gsi {}", fd.as_raw_fd(), gsi); self.fd - .register_irqfd(&fd, gsi) + .register_irqfd(fd, gsi) .map_err(|e| vm::HypervisorVmError::RegisterIrqFd(e.into()))?; Ok(()) @@ -720,7 +720,7 @@ impl vm::Vm for MshvVm { debug!("unregister_irqfd fd {} gsi {}", fd.as_raw_fd(), gsi); self.fd - .unregister_irqfd(&fd, gsi) + .unregister_irqfd(fd, gsi) .map_err(|e| vm::HypervisorVmError::UnregisterIrqFd(e.into()))?; Ok(()) @@ -833,7 +833,7 @@ impl vm::Vm for MshvVm { unsafe { let entries_slice: &mut [mshv_msi_routing_entry] = msi_routing[0].entries.as_mut_slice(entries.len()); - entries_slice.copy_from_slice(&entries); + entries_slice.copy_from_slice(entries); } self.fd diff --git a/net_util/src/ctrl_queue.rs b/net_util/src/ctrl_queue.rs index 269d659b9..b820afdbb 100644 --- a/net_util/src/ctrl_queue.rs +++ b/net_util/src/ctrl_queue.rs @@ -47,7 +47,7 @@ impl CtrlQueue { pub fn process(&mut self, mem: &GuestMemoryMmap, queue: &mut Queue) -> Result { let mut used_desc_heads = Vec::new(); - for avail_desc in queue.iter(&mem) { + for avail_desc in queue.iter(mem) { let ctrl_hdr: ControlHeader = mem.read_obj(avail_desc.addr).map_err(Error::GuestMemory)?; let data_desc = avail_desc @@ -111,8 +111,8 @@ impl CtrlQueue { } for (desc_index, len) in used_desc_heads.iter() { - queue.add_used(&mem, *desc_index, *len); - queue.update_avail_event(&mem); + queue.add_used(mem, *desc_index, *len); + queue.update_avail_event(mem); } Ok(!used_desc_heads.is_empty()) diff --git a/net_util/src/mac.rs b/net_util/src/mac.rs index 5fb8517c5..6dbdd119d 100644 --- a/net_util/src/mac.rs +++ b/net_util/src/mac.rs @@ -57,7 +57,7 @@ impl MacAddr { // TODO: using something like std::mem::uninitialized could avoid the extra initialization, // if this ever becomes a performance bottleneck. let mut bytes = [0u8; MAC_ADDR_LEN]; - bytes[..].copy_from_slice(&src); + bytes[..].copy_from_slice(src); MacAddr { bytes } } diff --git a/net_util/src/queue_pair.rs b/net_util/src/queue_pair.rs index 83290db1f..60727e1fd 100644 --- a/net_util/src/queue_pair.rs +++ b/net_util/src/queue_pair.rs @@ -40,7 +40,7 @@ impl TxVirtio { queue: &mut Queue, rate_limiter: &mut Option, ) -> Result<(), NetQueuePairError> { - while let Some(avail_desc) = queue.iter(&mem).next() { + while let Some(avail_desc) = queue.iter(mem).next() { let head_index = avail_desc.index; let mut next_desc = Some(avail_desc); @@ -108,8 +108,8 @@ impl TxVirtio { self.counter_frames += Wrapping(1); } - queue.add_used(&mem, head_index, 0); - queue.update_avail_event(&mem); + queue.add_used(mem, head_index, 0); + queue.update_avail_event(mem); } Ok(()) @@ -146,7 +146,7 @@ impl RxVirtio { let mut exhausted_descs = true; let mut rate_limit_reached = false; - while let Some(avail_desc) = queue.iter(&mem).next() { + while let Some(avail_desc) = queue.iter(mem).next() { if rate_limit_reached { exhausted_descs = false; queue.go_to_previous_position(); @@ -208,8 +208,8 @@ impl RxVirtio { 0 }; - queue.add_used(&mem, head_index, len); - queue.update_avail_event(&mem); + queue.add_used(mem, head_index, len); + queue.update_avail_event(mem); // For the sake of simplicity (keeping the handling of RX_QUEUE_EVENT and // RX_TAP_EVENT totally asynchronous), we always let the 'last' descriptor diff --git a/net_util/src/tap.rs b/net_util/src/tap.rs index a03fdff3c..83d40a1b4 100644 --- a/net_util/src/tap.rs +++ b/net_util/src/tap.rs @@ -384,7 +384,7 @@ impl Read for Tap { impl Write for Tap { fn write(&mut self, buf: &[u8]) -> IoResult { - self.tap_file.write(&buf) + self.tap_file.write(buf) } fn flush(&mut self) -> IoResult<()> { diff --git a/qcow/src/qcow.rs b/qcow/src/qcow.rs index 828af86e6..ac84de76e 100644 --- a/qcow/src/qcow.rs +++ b/qcow/src/qcow.rs @@ -576,7 +576,7 @@ impl QcowFile { /// Returns the L1 lookup table for this file. This is only useful for debugging. pub fn l1_table(&self) -> &[u64] { - &self.l1_table.get_values() + self.l1_table.get_values() } /// Returns an L2_table of cluster addresses, only used for debugging. @@ -613,7 +613,7 @@ impl QcowFile { /// Returns the refcount table for this file. This is only useful for debugging. pub fn ref_table(&self) -> &[u64] { - &self.refcounts.ref_table() + self.refcounts.ref_table() } /// Returns the `index`th refcount block from the file. @@ -831,7 +831,7 @@ impl QcowFile { // Rewrite the top-level refcount table. raw_file - .write_pointer_table(header.refcount_table_offset, &ref_table, 0) + .write_pointer_table(header.refcount_table_offset, ref_table, 0) .map_err(Error::WritingHeader)?; // Rewrite the header again, now with lazy refcounts disabled. @@ -1379,7 +1379,7 @@ impl QcowFile { let mut sync_required = if self.l1_table.dirty() { self.raw_file.write_pointer_table( self.header.l1_table_offset, - &self.l1_table.get_values(), + self.l1_table.get_values(), 0, )?; self.l1_table.mark_clean(); @@ -1783,7 +1783,7 @@ mod tests { F: FnMut(RawFile), { let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false); - disk_file.write_all(&header).unwrap(); + disk_file.write_all(header).unwrap(); disk_file.set_len(0x1_0000_0000).unwrap(); disk_file.seek(SeekFrom::Start(0)).unwrap(); diff --git a/qcow/src/refcount.rs b/qcow/src/refcount.rs index be5bb6db0..ab3968cb7 100644 --- a/qcow/src/refcount.rs +++ b/qcow/src/refcount.rs @@ -171,7 +171,7 @@ impl RefCount { if self.ref_table.dirty() { raw_file.write_pointer_table( self.refcount_table_offset, - &self.ref_table.get_values(), + self.ref_table.get_values(), 0, )?; self.ref_table.mark_clean(); @@ -210,7 +210,7 @@ impl RefCount { /// Returns the refcount table for this file. This is only useful for debugging. pub fn ref_table(&self) -> &[u64] { - &self.ref_table.get_values() + self.ref_table.get_values() } /// Returns the refcounts stored in the given block. diff --git a/src/main.rs b/src/main.rs index f2661cf74..5215141bc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -150,7 +150,7 @@ fn create_app<'a, 'b>( topology=:::,\ kvm_hyperv=on|off,max_phys_bits=", ) - .default_value(&default_vcpus) + .default_value(default_vcpus) .group("vm-config"), ) .arg( @@ -164,7 +164,7 @@ fn create_app<'a, 'b>( hotplug_size=,\ hotplugged_size=\"", ) - .default_value(&default_memory) + .default_value(default_memory) .group("vm-config"), ) .arg( @@ -229,7 +229,7 @@ fn create_app<'a, 'b>( .help( "Random number generator parameters \"src=,iommu=on|off\"", ) - .default_value(&default_rng) + .default_value(default_rng) .group("vm-config"), ) .arg( diff --git a/tests/integration.rs b/tests/integration.rs index 978e9b0a2..e7e52e99b 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -1765,7 +1765,7 @@ mod tests { fn get_counters(api_socket: &str) -> Counters { // Get counters - let (cmd_success, cmd_output) = remote_command_w_output(&api_socket, "counters", None); + let (cmd_success, cmd_output) = remote_command_w_output(api_socket, "counters", None); assert!(cmd_success); let counters: HashMap<&str, HashMap<&str, u64>> = @@ -1813,7 +1813,7 @@ mod tests { } fn get_pty_path(api_socket: &str, pty_type: &str) -> PathBuf { - let (cmd_success, cmd_output) = remote_command_w_output(&api_socket, "info", None); + let (cmd_success, cmd_output) = remote_command_w_output(api_socket, "info", None); assert!(cmd_success); let info: serde_json::Value = serde_json::from_slice(&cmd_output).unwrap_or_default(); assert_eq!("Pty", info["config"][pty_type]["mode"]); @@ -1859,7 +1859,7 @@ mod tests { } fn balloon_size(api_socket: &str) -> u64 { - let (cmd_success, cmd_output) = remote_command_w_output(&api_socket, "info", None); + let (cmd_success, cmd_output) = remote_command_w_output(api_socket, "info", None); assert!(cmd_success); let info: serde_json::Value = serde_json::from_slice(&cmd_output).unwrap_or_default(); @@ -5433,7 +5433,7 @@ mod tests { "create", "-f", "raw", - &img.to_str().unwrap(), + img.to_str().unwrap(), format!("{}m", sz).as_str(), ]) .output() @@ -5443,7 +5443,7 @@ mod tests { // Associate image to a loop device let out = Command::new("losetup") - .args(&["--show", "-f", &img.to_str().unwrap()]) + .args(&["--show", "-f", img.to_str().unwrap()]) .output() .expect("failed to create loop device") .stdout; @@ -5467,7 +5467,7 @@ mod tests { // Disengage the loop device let out = Command::new("losetup") - .args(&["-d", &loop_dev]) + .args(&["-d", loop_dev]) .output() .expect("loop device not found") .stdout; @@ -5480,7 +5480,7 @@ mod tests { "--offset", (512 * 2048).to_string().as_str(), "-f", - &img.to_str().unwrap(), + img.to_str().unwrap(), ]) .output() .expect("failed to create loop device") @@ -5504,7 +5504,7 @@ mod tests { // Disengage the loop device let out = Command::new("losetup") - .args(&["-d", &loop_dev]) + .args(&["-d", loop_dev]) .output() .unwrap_or_else(|_| panic!("loop device '{}' not found", loop_dev)) .stdout; diff --git a/vhost_user_block/src/lib.rs b/vhost_user_block/src/lib.rs index a576a6059..eed25c1de 100644 --- a/vhost_user_block/src/lib.rs +++ b/vhost_user_block/src/lib.rs @@ -154,7 +154,7 @@ impl VhostUserBlkThread { if self.event_idx { let queue = vring.mut_queue(); if let Some(used_idx) = queue.add_used(mem, head.index, len) { - if queue.needs_notification(&mem, Wrapping(used_idx)) { + if queue.needs_notification(mem, Wrapping(used_idx)) { debug!("signalling queue"); vring.signal_used_queue().unwrap(); } else { @@ -391,7 +391,7 @@ impl VhostUserBackend for VhostUserBlkBackend { return Err(io::Error::from_raw_os_error(libc::EINVAL)); } let (_, right) = config_slice.split_at_mut(offset as usize); - right.copy_from_slice(&data); + right.copy_from_slice(data); self.update_writeback(); Ok(()) } diff --git a/virtio-devices/src/transport/pci_device.rs b/virtio-devices/src/transport/pci_device.rs index 7f42f0c20..12450b03c 100644 --- a/virtio-devices/src/transport/pci_device.rs +++ b/virtio-devices/src/transport/pci_device.rs @@ -652,7 +652,7 @@ impl VirtioPciDevice { if offset < std::mem::size_of::() { let (_, right) = cap_slice.split_at_mut(offset); - right[..data_len].copy_from_slice(&data); + right[..data_len].copy_from_slice(data); None } else { // Safe since we know self.cap_pci_cfg_info.cap.cap.offset is 32bits long. diff --git a/virtio-devices/src/vhost_user/fs.rs b/virtio-devices/src/vhost_user/fs.rs index 25d082d6c..ebf3269e0 100644 --- a/virtio-devices/src/vhost_user/fs.rs +++ b/virtio-devices/src/vhost_user/fs.rs @@ -302,7 +302,7 @@ impl Fs { let num_queues = NUM_QUEUE_OFFSET + req_num_queues; // Connect to the vhost-user socket. - let mut vhost_user_fs = connect_vhost_user(false, &path, num_queues as u64, false)?; + let mut vhost_user_fs = connect_vhost_user(false, path, num_queues as u64, false)?; // Filling device and vring features VMM supports. let avail_features = DEFAULT_VIRTIO_FEATURES; diff --git a/virtio-devices/src/vsock/unix/muxer.rs b/virtio-devices/src/vsock/unix/muxer.rs index 9d57443aa..0f482d8b7 100644 --- a/virtio-devices/src/vsock/unix/muxer.rs +++ b/virtio-devices/src/vsock/unix/muxer.rs @@ -234,7 +234,7 @@ impl VsockChannel for VsockMuxer { // connection requests. if pkt.op() == uapi::VSOCK_OP_REQUEST { // Oh, this is a connection request! - self.handle_peer_request_pkt(&pkt); + self.handle_peer_request_pkt(pkt); } else { // Send back an RST, to let the drive know we weren't expecting this packet. self.enq_rst(pkt.dst_port(), pkt.src_port()); diff --git a/vm-virtio/src/queue.rs b/vm-virtio/src/queue.rs index 5dd801d11..fd441c800 100644 --- a/vm-virtio/src/queue.rs +++ b/vm-virtio/src/queue.rs @@ -697,7 +697,7 @@ impl Queue { let mut notify = true; if let Some(old_idx) = self.signalled_used { - if let Some(used_event) = self.get_used_event(&mem) { + if let Some(used_event) = self.get_used_event(mem) { debug!( "used_event = {:?} used_idx = {:?} old_idx = {:?}", used_event, used_idx, old_idx diff --git a/vmm/src/api/http.rs b/vmm/src/api/http.rs index b0c73e875..a8501da39 100644 --- a/vmm/src/api/http.rs +++ b/vmm/src/api/http.rs @@ -241,7 +241,7 @@ fn handle_http_request( let path = request.uri().get_abs_path().to_string(); let mut response = match HTTP_ROUTES.routes.get(&path) { Some(route) => match api_notifier.try_clone() { - Ok(notifier) => route.handle_request(&request, notifier, api_sender.clone()), + Ok(notifier) => route.handle_request(request, notifier, api_sender.clone()), Err(_) => error_response( HttpError::InternalServerError, StatusCode::InternalServerError, diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index f493a80bb..ee0d7751d 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -3159,7 +3159,7 @@ impl DeviceManager { device_cfg: &mut DeviceConfig, ) -> DeviceManagerResult { let pci = if let Some(pci_bus) = &self.pci_bus { - Arc::clone(&pci_bus) + Arc::clone(pci_bus) } else { return Err(DeviceManagerError::NoPciBus); }; @@ -3235,7 +3235,7 @@ impl DeviceManager { pub fn eject_device(&mut self, device_id: u8) -> DeviceManagerResult<()> { // Retrieve the PCI bus. let pci = if let Some(pci_bus) = &self.pci_bus { - Arc::clone(&pci_bus) + Arc::clone(pci_bus) } else { return Err(DeviceManagerError::NoPciBus); }; @@ -3382,7 +3382,7 @@ impl DeviceManager { } let pci = if let Some(pci_bus) = &self.pci_bus { - Arc::clone(&pci_bus) + Arc::clone(pci_bus) } else { return Err(DeviceManagerError::NoPciBus); }; @@ -4049,7 +4049,7 @@ impl BusDevice for DeviceManager { B0EJ_FIELD_OFFSET => { assert!(data.len() == B0EJ_FIELD_SIZE); let mut data_array: [u8; 4] = [0, 0, 0, 0]; - data_array.copy_from_slice(&data); + data_array.copy_from_slice(data); let device_bitmap = u32::from_le_bytes(data_array); for device_id in 0..32 { diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index a2262332b..d9a6abff0 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -1186,7 +1186,7 @@ impl Vm { self.device_manager .lock() .unwrap() - .update_memory(&new_region) + .update_memory(new_region) .map_err(Error::DeviceManager)?; match memory_config.hotplug_method { @@ -2580,7 +2580,7 @@ pub fn test_vm() { println!( "IO out -- addr: {:#x} data [{:?}]", addr, - str::from_utf8(&data).unwrap() + str::from_utf8(data).unwrap() ); } VmExit::Reset => {