commit b27ec8f0320c300d18163789c0bf077777e09187
author Alice Wang <aliceywang@google.com> Thu Jul 27 13:19:26 2023 +0000
committer Alice Wang <aliceywang@google.com> Thu Jul 27 13:21:48 2023 +0000
tree 63257a4a137193d2e1112905e2693b494797f4db
parent b0a992a56398643b09f5bb8a97cb8b2c7ce2fb74

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

pvmfw/src/gpt.rs

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)
     }
 }
 

vmbase/example/src/pci.rs

diff --git a/vmbase/example/src/pci.rs b/vmbase/example/src/pci.rs
index 26bc29b..b838539 100644
--- a/vmbase/example/src/pci.rs
+++ b/vmbase/example/src/pci.rs
@@ -78,7 +78,7 @@
             assert_eq!(blk.capacity(), EXPECTED_SECTOR_COUNT as u64);
             let mut data = [0; SECTOR_SIZE_BYTES * EXPECTED_SECTOR_COUNT];
             for i in 0..EXPECTED_SECTOR_COUNT {
-                blk.read_block(i, &mut data[i * SECTOR_SIZE_BYTES..(i + 1) * SECTOR_SIZE_BYTES])
+                blk.read_blocks(i, &mut data[i * SECTOR_SIZE_BYTES..(i + 1) * SECTOR_SIZE_BYTES])
                     .expect("Failed to read block device.");
             }
             for (i, chunk) in data.chunks(size_of::<u32>()).enumerate() {
@@ -89,7 +89,7 @@
         1 => {
             assert_eq!(blk.capacity(), 0);
             let mut data = [0; SECTOR_SIZE_BYTES];
-            assert_eq!(blk.read_block(0, &mut data), Err(Error::IoError));
+            assert_eq!(blk.read_blocks(0, &mut data), Err(Error::IoError));
         }
         _ => panic!("Unexpected VirtIO block device index {}.", index),
     }