mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-01-30 04:19:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: block: Support flush command

Browse source 
The "supports flush" bit wasn't set in the device features, so the guest
wasn't syncing. Handle the request, which is 0 length so needs special
casing in the `parse` function.

Change-Id: I079611df912cd077362b2ee9925cf730ba86d9e5
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1135940
This commit is contained in:
Dylan Reid 2018-07-12 16:10:13 -07:00 committed by chrome-bot
parent d1e391b8d4
commit 6fd0c6f223
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,8 @@ const VIRTIO_BLK_S_OK: u8 = 0;
const VIRTIO_BLK_S_IOERR: u8 = 1;
const VIRTIO_BLK_S_UNSUPP: u8 = 2;
const VIRTIO_BLK_F_FLUSH: u32 = 0x200;
pub trait DiskFile: Read + Seek + Write {}
impl<D: Read + Seek + Write> DiskFile for D {}
@ -131,6 +133,16 @@ impl Request {
}
let req_type = request_type(&mem, avail_desc.addr)?;
if req_type == RequestType::Flush {
return Ok(Request {
request_type: req_type,
sector: 0,
data_addr: GuestAddress(0),
data_len: 0,
status_addr: GuestAddress(0),
})
}
let sector = sector(&mem, avail_desc.addr)?;
let data_desc = avail_desc
.next_descriptor()
@ -356,6 +368,13 @@ impl<T: 'static + AsRawFd + DiskFile + Send> VirtioDevice for Block<T> {
keep_fds
}
fn features(&self, page: u32) -> u32 {
match page {
0 => VIRTIO_BLK_F_FLUSH,
_ => 0,
}
}
fn device_type(&self) -> u32 {
TYPE_BLOCK
}