mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-01-12 16:45:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: block: store features as a u64

Browse source 
This matches other virtio device models (net, p9, vsock) and makes it
easier to add flags conditionally at device creation time.

BUG=chromium:872973
TEST=cargo test -p devices

Change-Id: I65b3f37c220fae44a3f6b397acc6c0eec2b70bf2
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1170305
Reviewed-by: Zach Reizner <zachr@chromium.org>
This commit is contained in:
Daniel Verkamp 2018-08-09 16:51:33 -07:00 committed by chrome-bot
parent de9ae03d52
commit 18fa20569f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
devices/src/virtio/block.rs
View file

@ -344,6 +344,7 @@ pub struct Block<T: DiskFile> {
kill_evt: Option<EventFd>,
disk_image: Option<T>,
config_space: Vec<u8>,
avail_features: u64,
}
fn build_config_space(disk_size: u64) -> Vec<u8> {
@ -370,10 +371,14 @@ impl<T: DiskFile> Block<T> {
disk_size,
SECTOR_SIZE);
}
let mut avail_features: u64 = 1 << VIRTIO_BLK_F_FLUSH;
Ok(Block {
kill_evt: None,
disk_image: Some(disk_image),
config_space: build_config_space(disk_size),
avail_features,
})
}
}
@ -400,7 +405,8 @@ impl<T: 'static + AsRawFd + DiskFile + Send> VirtioDevice for Block<T> {
fn features(&self, page: u32) -> u32 {
match page {
0 => 1 << VIRTIO_BLK_F_FLUSH,
0 => self.avail_features as u32,
1 => (self.avail_features >> 32) as u32,
_ => 0,
}
}