github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

fmt: do cargo fmt and add a dependency for blk_dev

Browse Source 
fmt: do cargo fmt and add a dependency for blk_dev

Signed-off-by: Chao Wu <chaowu@linux.alibaba.com>
This commit is contained in:
Chao Wu 2022-07-06 11:58:21 +08:00
parent 47a4142e0d
commit 9cee52153b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dragonball/src/device_manager/blk_dev_mgr.rs
View File

@ -21,6 +21,7 @@ use serde_derive::{Deserialize, Serialize};
use crate::address_space_manager::GuestAddressSpaceImpl; use crate::address_space_manager::GuestAddressSpaceImpl;
use crate::config_manager::{ConfigItem, DeviceConfigInfo, RateLimiterConfigInfo}; use crate::config_manager::{ConfigItem, DeviceConfigInfo, RateLimiterConfigInfo};
use crate::device_manager::blk_dev_mgr::BlockDeviceError::InvalidDeviceId;
use crate::device_manager::{DeviceManager, DeviceMgrError, DeviceOpContext}; use crate::device_manager::{DeviceManager, DeviceMgrError, DeviceOpContext};
use crate::get_bucket_update; use crate::get_bucket_update;
use crate::vm::KernelConfigInfo; use crate::vm::KernelConfigInfo;

9
src/dragonball/src/vcpu/aarch64.rs
View File

@ -6,20 +6,20 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the THIRD-PARTY file. // found in the THIRD-PARTY file.
use std::ops::Deref;
use std::sync::mpsc::{channel, Sender}; use std::sync::mpsc::{channel, Sender};
use std::sync::Arc; use std::sync::Arc;
use std::ops::Deref;
use crate::IoManagerCached; use crate::IoManagerCached;
use dbs_utils::time::TimestampUs;
use dbs_arch::regs; use dbs_arch::regs;
use dbs_boot::get_fdt_addr; use dbs_boot::get_fdt_addr;
use dbs_utils::time::TimestampUs;
use kvm_ioctls::{VcpuFd, VmFd}; use kvm_ioctls::{VcpuFd, VmFd};
use vm_memory::{Address, GuestAddress, GuestAddressSpace}; use vm_memory::{Address, GuestAddress, GuestAddressSpace};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
use crate::address_space_manager::GuestAddressSpaceImpl; use crate::address_space_manager::GuestAddressSpaceImpl;
use crate::vcpu::vcpu_impl::{Result, Vcpu, VcpuStateEvent, VcpuError}; use crate::vcpu::vcpu_impl::{Result, Vcpu, VcpuError, VcpuStateEvent};
use crate::vcpu::VcpuConfig; use crate::vcpu::VcpuConfig;
#[allow(unused)] #[allow(unused)]
@ -111,8 +111,7 @@ impl Vcpu {
.map_err(VcpuError::REGSConfiguration)?; .map_err(VcpuError::REGSConfiguration)?;
} }
self.mpidr = self.mpidr = regs::read_mpidr(&self.fd).map_err(VcpuError::REGSConfiguration)?;
regs::read_mpidr(&self.fd).map_err(VcpuError::REGSConfiguration)?;
Ok(()) Ok(())
} }