External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-03-20 07:58:55 +00:00
Code

vm-virtio: vhost-user: Vring should be enabled after initialization

Browse Source 
As mentioned in the vhost-user specification, each ring is initialized
in a stopped state. This means each ring should be enabled only after
it has been correctly initialized.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2019-08-30 12:01:00 -07:00 committed by Rob Bradford
parent a4ebcf486d
commit 97699a521f
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm-virtio/src/vhost_user/mod.rs
View File

@ -77,8 +77,6 @@ pub enum Error {
VhostUserSetVringKick(VhostError),
/// Set vring enable failed.
VhostUserSetVringEnable(VhostError),
/// Vhost-user setup vring failed.
VhostUserSetupVringFailed,
/// Failed to create vhost eventfd.
VhostIrqCreate(io::Error),
/// Failed to read vhost eventfd.

13
vm-virtio/src/vhost_user/vu_common_ctrl.rs
View File

@ -85,6 +85,9 @@ pub fn setup_vhost_user_vring(
vu.set_vring_kick(queue_index, &queue_evts[queue_index])
.map_err(Error::VhostUserSetVringKick)?;
vu.set_vring_enable(queue_index, true)
.map_err(Error::VhostUserSetVringEnable)?;
}
Ok(vu_interrupt_list)
@ -97,17 +100,9 @@ pub fn setup_vhost_user(
queue_evts: Vec<EventFd>,
acked_features: u64,
) -> Result<Vec<(EventFd, Queue)>> {
for i in 0..queues.len() {
vu.set_vring_enable(i, true)
.map_err(Error::VhostUserSetVringEnable)?;
}
let backend_features = vu.get_features().unwrap();
vu.set_features(acked_features & backend_features)
.map_err(Error::VhostUserSetFeatures)?;
match setup_vhost_user_vring(vu, mem, queues, queue_evts) {
Ok(vu_interrupt_list) => Ok(vu_interrupt_list),
Err(_) => Err(Error::VhostUserSetupVringFailed),
}
setup_vhost_user_vring(vu, mem, queues, queue_evts)
}