@@ -602,7 +602,7 @@ mod tests {
602
602
GuestAddress ( 0x200 ) ,
603
603
) ;
604
604
// Clear the file.
605
- req_exec. inner . write_zeroes_at ( 0x00 , 0x1000 ) . unwrap ( ) ;
605
+ req_exec. inner_mut ( ) . write_zeroes_at ( 0x00 , 0x1000 ) . unwrap ( ) ;
606
606
607
607
mem. write_slice ( & [ NON_ZERO_VALUE ; 0x200 ] , GuestAddress ( 0x200 ) )
608
608
. unwrap ( ) ;
@@ -612,34 +612,34 @@ mod tests {
612
612
// address and 0x200 bytes from 0x800 address. 0 bytes should've been written in memory.
613
613
assert_eq ! ( req_exec. execute( & mem, & out_req) . unwrap( ) , 0x00 ) ;
614
614
615
- req_exec. inner . rewind ( ) . unwrap ( ) ;
615
+ req_exec. inner ( ) . rewind ( ) . unwrap ( ) ;
616
616
let mut v = vec ! [ 0x00 ; 0x300 ] ;
617
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x300 ) ;
617
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x300 ) ;
618
618
assert_eq ! ( v, vec![ 0x00 ; 0x300 ] ) ;
619
619
620
620
// We are at offset 0x300.
621
621
v = vec ! [ 0x00 ; 0x200 ] ;
622
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
622
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
623
623
assert_eq ! ( v, vec![ NON_ZERO_VALUE ; 0x200 ] ) ;
624
624
625
625
// We are at offset 0x500.
626
626
v = vec ! [ 0x00 ; 0x100 ] ;
627
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x100 ) ;
627
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x100 ) ;
628
628
assert_eq ! ( v, vec![ 0x00 ; 0x100 ] ) ;
629
629
630
630
// We are at offset 0x600.
631
631
v = vec ! [ 0x00 ; 0x80 ] ;
632
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x80 ) ;
632
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x80 ) ;
633
633
assert_eq ! ( v, vec![ 0x00 ; 0x80 ] ) ;
634
634
635
635
// We are at offset 0x680.
636
636
v = vec ! [ 0x00 ; 0x100 ] ;
637
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x100 ) ;
637
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x100 ) ;
638
638
assert_eq ! ( v, vec![ NON_ZERO_VALUE ; 0x100 ] ) ;
639
639
640
640
// We are at offset 0x780.
641
641
v = vec ! [ 0x00 ; 0x80 ] ;
642
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x80 ) ;
642
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x80 ) ;
643
643
assert_eq ! ( v, vec![ 0x00 ; 0x80 ] ) ;
644
644
645
645
// Writing 512 bytes to the last sector should be successful.
@@ -835,44 +835,44 @@ mod tests {
835
835
// 0 bytes should've been written in memory.
836
836
assert_eq ! ( req_exec. execute( & mem, & wr_zeroes_req) . unwrap( ) , 0x00 ) ;
837
837
838
- req_exec. inner . rewind ( ) . unwrap ( ) ;
838
+ req_exec. inner ( ) . rewind ( ) . unwrap ( ) ;
839
839
let mut v = vec ! [ 0x00 ; 0x300 ] ;
840
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x300 ) ;
840
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x300 ) ;
841
841
assert_eq ! ( v, vec![ 0x00 ; 0x300 ] ) ;
842
842
843
843
// We are at offset 0x300.
844
844
v = vec ! [ 0x00 ; 0x100 ] ;
845
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x100 ) ;
845
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x100 ) ;
846
846
assert_eq ! ( v, vec![ NON_ZERO_VALUE ; 0x100 ] ) ;
847
847
848
848
// We are at offset 0x400 -> 0x400 bytes should've been zeroed out.
849
849
v = vec ! [ 0x00 ; 0x400 ] ;
850
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x400 ) ;
850
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x400 ) ;
851
851
assert_eq ! ( v, vec![ 0x00 ; 0x400 ] ) ;
852
852
853
853
// We are at offset 0x800.
854
854
v = vec ! [ 0x00 ; 0x200 ] ;
855
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
855
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
856
856
assert_eq ! ( v, vec![ NON_ZERO_VALUE + 1 ; 0x200 ] ) ;
857
857
858
858
// We are at offset 0xA00 -> 0x200 bytes should've been zeroed out.
859
859
v = vec ! [ 0x00 ; 0x200 ] ;
860
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
860
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
861
861
assert_eq ! ( v, vec![ 0 ; 0x200 ] ) ;
862
862
863
863
// We are at offset 0xC00.
864
864
v = vec ! [ 0x00 ; 0x100 ] ;
865
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x100 ) ;
865
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x100 ) ;
866
866
assert_eq ! ( v, vec![ NON_ZERO_VALUE + 1 ; 0x100 ] ) ;
867
867
868
868
// We are at offset 0xD00.
869
869
v = vec ! [ 0x00 ; 0x100 ] ;
870
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x100 ) ;
870
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x100 ) ;
871
871
assert_eq ! ( v, vec![ 0 ; 0x100 ] ) ;
872
872
873
873
// We are at offset 0xE00.
874
874
v = vec ! [ 0x00 ; 0x200 ] ;
875
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
875
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
876
876
assert_eq ! ( v, vec![ NON_ZERO_VALUE ; 0x200 ] ) ;
877
877
878
878
// Test discard request.
@@ -894,14 +894,14 @@ mod tests {
894
894
// 0 bytes should've been written in memory.
895
895
assert_eq ! ( req_exec. execute( & mem, & discard_req) . unwrap( ) , 0x00 ) ;
896
896
897
- req_exec. inner . seek ( SeekFrom :: Start ( 0xE00 ) ) . unwrap ( ) ;
897
+ req_exec. inner ( ) . seek ( SeekFrom :: Start ( 0xE00 ) ) . unwrap ( ) ;
898
898
let mut v = vec ! [ 0x00 ; 0x200 ] ;
899
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
899
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
900
900
assert_eq ! ( v, vec![ 0x00 ; 0x200 ] ) ;
901
901
902
902
// Even though we punched a hole at the end of the file, the file size should remain the
903
903
// same since FALLOC_FL_PUNCH_HOLE is used with FALLOC_FL_KEEP_SIZE.
904
- assert_eq ! ( req_exec. inner. metadata( ) . unwrap( ) . len( ) , 0x1000 ) ;
904
+ assert_eq ! ( req_exec. inner( ) . metadata( ) . unwrap( ) . len( ) , 0x1000 ) ;
905
905
906
906
// Test that write zeroes request with unmap bit set is okay.
907
907
let wr_zeroes_req = DiscardWriteZeroes {
@@ -919,30 +919,30 @@ mod tests {
919
919
GuestAddress ( 0x2000 ) ,
920
920
) ;
921
921
922
- req_exec. inner . seek ( SeekFrom :: Start ( 0x800 ) ) . unwrap ( ) ;
922
+ req_exec. inner ( ) . seek ( SeekFrom :: Start ( 0x800 ) ) . unwrap ( ) ;
923
923
let mut v = vec ! [ 0x00 ; 0x200 ] ;
924
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
924
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
925
925
// Data is != 0 before the write zeroes request.
926
926
assert_eq ! ( v, vec![ NON_ZERO_VALUE + 1 ; 0x200 ] ) ;
927
927
// Let's write some data in the file right before and after the fourth sector to confirm
928
928
// that those regions won't be zeroed out.
929
929
// After the fourth sector:
930
930
let v = vec ! [ NON_ZERO_VALUE + 2 ; 0x200 ] ;
931
- assert_eq ! ( req_exec. inner. write( & v) . unwrap( ) , 0x200 ) ;
931
+ assert_eq ! ( req_exec. inner( ) . write( & v) . unwrap( ) , 0x200 ) ;
932
932
// Before the fourth sector:
933
- req_exec. inner . seek ( SeekFrom :: Start ( 0x600 ) ) . unwrap ( ) ;
934
- assert_eq ! ( req_exec. inner. write( & v) . unwrap( ) , 0x200 ) ;
933
+ req_exec. inner ( ) . seek ( SeekFrom :: Start ( 0x600 ) ) . unwrap ( ) ;
934
+ assert_eq ! ( req_exec. inner( ) . write( & v) . unwrap( ) , 0x200 ) ;
935
935
936
936
// 0 bytes should've been written in memory.
937
937
assert_eq ! ( req_exec. execute( & mem, & wr_zeroes_req) . unwrap( ) , 0x00 ) ;
938
938
939
- req_exec. inner . seek ( SeekFrom :: Start ( 0x600 ) ) . unwrap ( ) ;
939
+ req_exec. inner ( ) . seek ( SeekFrom :: Start ( 0x600 ) ) . unwrap ( ) ;
940
940
let mut v = vec ! [ 0x00 ; 0x200 ] ;
941
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
941
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
942
942
assert_eq ! ( v, vec![ NON_ZERO_VALUE + 2 ; 0x200 ] ) ;
943
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
943
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
944
944
assert_eq ! ( v, vec![ 0 ; 0x200 ] ) ;
945
- assert_eq ! ( req_exec. inner. read( & mut v) . unwrap( ) , 0x200 ) ;
945
+ assert_eq ! ( req_exec. inner( ) . read( & mut v) . unwrap( ) , 0x200 ) ;
946
946
assert_eq ! ( v, vec![ NON_ZERO_VALUE + 2 ; 0x200 ] ) ;
947
947
948
948
// VIRTIO_BLK_F_DISCARD not negotiated.
0 commit comments