Adjust virtio_blk API for virtio-drivers 0.6.0
Bug: 291586508
Test: atest vmbase_example.integration_test
Test: m pvmfw_img
Change-Id: Ie3c25a6524f3b7b2ca88ad303d11c86d4e49d44b
diff --git a/pvmfw/src/gpt.rs b/pvmfw/src/gpt.rs
index 1060460..06bf994 100644
--- a/pvmfw/src/gpt.rs
+++ b/pvmfw/src/gpt.rs
@@ -103,7 +103,7 @@
fn new(mut device: VirtIOBlk) -> Result<Self> {
let mut blk = [0; Self::LBA_SIZE];
- device.read_block(Header::LBA, &mut blk).map_err(Error::FailedRead)?;
+ device.read_blocks(Header::LBA, &mut blk).map_err(Error::FailedRead)?;
let header = Header::read_from_prefix(blk.as_slice()).unwrap();
if !header.is_valid() {
return Err(Error::InvalidHeader);
@@ -145,11 +145,11 @@
}
fn read_block(&mut self, index: usize, blk: &mut [u8]) -> Result<()> {
- self.device.read_block(index, blk).map_err(Error::FailedRead)
+ self.device.read_blocks(index, blk).map_err(Error::FailedRead)
}
fn write_block(&mut self, index: usize, blk: &[u8]) -> Result<()> {
- self.device.write_block(index, blk).map_err(Error::FailedWrite)
+ self.device.write_blocks(index, blk).map_err(Error::FailedWrite)
}
}