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

vm-virtio: vhost-user-blk: Expect an identifier upon device creation

Browse Source 
This identifier is chosen from the DeviceManager so that it will manage
all identifiers across the VM, which will ensure uniqueness.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-04-27 13:56:26 +02:00 committed by Rob Bradford
parent bb7fa71fcb
commit 46e0b3ff75
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vm-virtio/src/vhost_user/blk.rs
View File

@ -34,6 +34,7 @@ struct SlaveReqHandler {}
impl VhostUserMasterReqHandler for SlaveReqHandler {} impl VhostUserMasterReqHandler for SlaveReqHandler {}
pub struct Blk { pub struct Blk {
id: String,
vhost_user_blk: Master, vhost_user_blk: Master,
kill_evt: Option<EventFd>, kill_evt: Option<EventFd>,
pause_evt: Option<EventFd>, pause_evt: Option<EventFd>,
@ -49,7 +50,7 @@ pub struct Blk {
impl Blk { impl Blk {
/// Create a new vhost-user-blk device /// Create a new vhost-user-blk device
pub fn new(wce: bool, vu_cfg: VhostUserConfig) -> Result<Blk> { pub fn new(id: String, wce: bool, vu_cfg: VhostUserConfig) -> Result<Blk> {
let mut vhost_user_blk = Master::connect(&vu_cfg.sock, vu_cfg.num_queues as u64) let mut vhost_user_blk = Master::connect(&vu_cfg.sock, vu_cfg.num_queues as u64)
.map_err(Error::VhostUserCreateMaster)?; .map_err(Error::VhostUserCreateMaster)?;
@ -140,6 +141,7 @@ impl Blk {
} }
Ok(Blk { Ok(Blk {
id,
vhost_user_blk, vhost_user_blk,
kill_evt: None, kill_evt: None,
pause_evt: None, pause_evt: None,
@ -328,6 +330,10 @@ impl VirtioDevice for Blk {
} }
virtio_pausable!(Blk); virtio_pausable!(Blk);
impl Snapshottable for Blk {} impl Snapshottable for Blk {
fn id(&self) -> String {
self.id.clone()
}
}
impl Transportable for Blk {} impl Transportable for Blk {}
impl Migratable for Blk {} impl Migratable for Blk {}

2
vmm/src/device_manager.rs
View File

@ -1201,7 +1201,7 @@ impl DeviceManager {
queue_size: disk_cfg.queue_size, queue_size: disk_cfg.queue_size,
}; };
let vhost_user_block_device = Arc::new(Mutex::new( let vhost_user_block_device = Arc::new(Mutex::new(
vm_virtio::vhost_user::Blk::new(disk_cfg.wce, vu_cfg) vm_virtio::vhost_user::Blk::new(id, disk_cfg.wce, vu_cfg)
.map_err(DeviceManagerError::CreateVhostUserBlk)?, .map_err(DeviceManagerError::CreateVhostUserBlk)?,
)); ));