External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 11:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: vhost_user: Don't set features before ACK from guest

Browse Source 
The VIRTIO features should not be set before they are acked from the
guest. This code was only present to overcome a vhost crate limitation
that was expecting the VIRTIO features to be set before we could fetch
and set the protocol features.

The vhost crate has been recently fixed by removing the limitation,
therefore there's no need for this workaround in the Cloud Hypervisor
codebase anymore.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2021-05-21 18:34:02 +02:00
parent 66d52199a7
commit 47be87c7cc
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virtio-devices/src/vhost_user/vu_common_ctrl.rs
View File

@ -81,10 +81,6 @@ pub fn negotiate_features_vhost_user(
// both VMM and backend support. // both VMM and backend support.
let backend_features = vu.get_features().map_err(Error::VhostUserGetFeatures)?; let backend_features = vu.get_features().map_err(Error::VhostUserGetFeatures)?;
let acked_features = avail_features & backend_features; let acked_features = avail_features & backend_features;
// Set features back is required by the vhost crate mechanism, since the
// later vhost call will check if features is filled in master before execution.
vu.set_features(acked_features)
.map_err(Error::VhostUserSetFeatures)?;
let acked_protocol_features = let acked_protocol_features =
if acked_features & VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits() != 0 { if acked_features & VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits() != 0 {