kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: vhost_user: Use the VhostUserHandle enum for LOG_ALL

Browse Source 
This is equivalent value but removes the need to manually use the
constant to shift.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-03-31 06:50:24 -07:00
parent 68691db37b
commit cc1735c399
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio-devices/src/vhost_user/vu_common_ctrl.rs
+4 -7
View File
@@ -12,7 +12,7 @@ use std::thread::sleep;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use log::{error, info}; use log::{error, info};
use vhost::vhost_kern::vhost_binding::{VHOST_F_LOG_ALL, VHOST_VRING_F_LOG}; use vhost::vhost_kern::vhost_binding::VHOST_VRING_F_LOG;
use vhost::vhost_user::message::{ use vhost::vhost_user::message::{
VhostTransferStateDirection, VhostTransferStatePhase, VhostUserHeaderFlag, VhostUserInflight, VhostTransferStateDirection, VhostTransferStatePhase, VhostUserHeaderFlag, VhostUserInflight,
VhostUserProtocolFeatures, VhostUserVirtioFeatures, VhostUserProtocolFeatures, VhostUserVirtioFeatures,
@@ -454,11 +454,8 @@ impl VhostUserHandle {
} }
fn update_supported_features(&mut self, acked_features: u64, acked_protocol_features: u64) { fn update_supported_features(&mut self, acked_features: u64, acked_protocol_features: u64) {
if (acked_features & u64::from(vhost::vhost_kern::vhost_binding::VHOST_F_LOG_ALL) != 0) self.supports_migration = acked_features & VhostUserVirtioFeatures::LOG_ALL.bits() != 0
&& (acked_protocol_features & VhostUserProtocolFeatures::LOG_SHMFD.bits() != 0) && acked_protocol_features & VhostUserProtocolFeatures::LOG_SHMFD.bits() != 0;
{
self.supports_migration = true;
}
self.supports_device_state = self.supports_device_state =
acked_protocol_features & VhostUserProtocolFeatures::DEVICE_STATE.bits() != 0; acked_protocol_features & VhostUserProtocolFeatures::DEVICE_STATE.bits() != 0;
} }
@@ -643,7 +640,7 @@ impl VhostUserHandle {
self.update_log_base(last_ram_addr)?; self.update_log_base(last_ram_addr)?;
// Enable VHOST_F_LOG_ALL feature // Enable VHOST_F_LOG_ALL feature
let features = self.acked_features | (1 << VHOST_F_LOG_ALL); let features = self.acked_features | VhostUserVirtioFeatures::LOG_ALL.bits();
self.vu self.vu
.set_features(features) .set_features(features)
.map_err(Error::VhostUserSetFeatures)?; .map_err(Error::VhostUserSetFeatures)?;