mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2025-02-21 10:52:25 +00:00
vhost_user_block: Automatically fix operator precedence clippy warning
Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
parent
1485e17268
commit
21f05ebb4f
@ -273,13 +273,14 @@ impl VhostUserBlkBackend {
|
||||
|
||||
fn update_writeback(&mut self) {
|
||||
// Use writeback from config if VIRTIO_BLK_F_CONFIG_WCE
|
||||
let writeback =
|
||||
if self.acked_features & 1 << VIRTIO_BLK_F_CONFIG_WCE == 1 << VIRTIO_BLK_F_CONFIG_WCE {
|
||||
self.config.writeback == 1
|
||||
} else {
|
||||
// Else check if VIRTIO_BLK_F_FLUSH negotiated
|
||||
self.acked_features & 1 << VIRTIO_BLK_F_FLUSH == 1 << VIRTIO_BLK_F_FLUSH
|
||||
};
|
||||
let writeback = if self.acked_features & (1 << VIRTIO_BLK_F_CONFIG_WCE)
|
||||
== 1 << VIRTIO_BLK_F_CONFIG_WCE
|
||||
{
|
||||
self.config.writeback == 1
|
||||
} else {
|
||||
// Else check if VIRTIO_BLK_F_FLUSH negotiated
|
||||
self.acked_features & (1 << VIRTIO_BLK_F_FLUSH) == 1 << VIRTIO_BLK_F_FLUSH
|
||||
};
|
||||
|
||||
info!(
|
||||
"Changing cache mode to {}",
|
||||
@ -306,14 +307,14 @@ impl VhostUserBackendMut for VhostUserBlkBackend {
|
||||
}
|
||||
|
||||
fn features(&self) -> u64 {
|
||||
let mut avail_features = 1 << VIRTIO_BLK_F_SEG_MAX
|
||||
| 1 << VIRTIO_BLK_F_BLK_SIZE
|
||||
| 1 << VIRTIO_BLK_F_FLUSH
|
||||
| 1 << VIRTIO_BLK_F_TOPOLOGY
|
||||
| 1 << VIRTIO_BLK_F_MQ
|
||||
| 1 << VIRTIO_BLK_F_CONFIG_WCE
|
||||
| 1 << VIRTIO_RING_F_EVENT_IDX
|
||||
| 1 << VIRTIO_F_VERSION_1
|
||||
let mut avail_features = (1 << VIRTIO_BLK_F_SEG_MAX)
|
||||
| (1 << VIRTIO_BLK_F_BLK_SIZE)
|
||||
| (1 << VIRTIO_BLK_F_FLUSH)
|
||||
| (1 << VIRTIO_BLK_F_TOPOLOGY)
|
||||
| (1 << VIRTIO_BLK_F_MQ)
|
||||
| (1 << VIRTIO_BLK_F_CONFIG_WCE)
|
||||
| (1 << VIRTIO_RING_F_EVENT_IDX)
|
||||
| (1 << VIRTIO_F_VERSION_1)
|
||||
| VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits();
|
||||
|
||||
if self.rdonly {
|
||||
|
Loading…
x
Reference in New Issue
Block a user