File tree Expand file tree Collapse file tree 6 files changed +22
-8
lines changed Expand file tree Collapse file tree 6 files changed +22
-8
lines changed Original file line number Diff line number Diff line change @@ -90,13 +90,13 @@ pub struct ConstantDevice;
90
90
impl ConstantDevice {
91
91
pub fn bus_read ( & mut self , offset : u64 , data : & mut [ u8 ] ) {
92
92
for ( i, v) in data. iter_mut ( ) . enumerate ( ) {
93
- * v = ( offset as u8 ) + ( i as u8 ) ;
93
+ * v = ( ( offset + i as u64 ) & 0xff ) as u8 ;
94
94
}
95
95
}
96
96
97
97
fn bus_write ( & mut self , offset : u64 , data : & [ u8 ] ) {
98
98
for ( i, v) in data. iter ( ) . enumerate ( ) {
99
- assert_eq ! ( * v, ( offset as u8 ) + ( i as u8 ) )
99
+ assert_eq ! ( * v, ( ( offset + i as u64 ) & 0xff ) as u8 )
100
100
}
101
101
}
102
102
}
Original file line number Diff line number Diff line change @@ -750,7 +750,10 @@ pub(crate) mod tests {
750
750
| ( u64:: from ( * deflate_on_oom) << VIRTIO_BALLOON_F_DEFLATE_ON_OOM )
751
751
| ( ( u64:: from ( * stats_interval) ) << VIRTIO_BALLOON_F_STATS_VQ ) ;
752
752
753
- assert_eq ! ( balloon. avail_features_by_page( 0 ) , features as u32 ) ;
753
+ assert_eq ! (
754
+ balloon. avail_features_by_page( 0 ) ,
755
+ ( features & 0xFFFFFFFF ) as u32
756
+ ) ;
754
757
assert_eq ! ( balloon. avail_features_by_page( 1 ) , ( features >> 32 ) as u32 ) ;
755
758
for i in 2 ..10 {
756
759
assert_eq ! ( balloon. avail_features_by_page( i) , 0u32 ) ;
Original file line number Diff line number Diff line change @@ -685,7 +685,7 @@ mod tests {
685
685
let cfg = disk_properties. virtio_block_config_space ( ) ;
686
686
assert_eq ! ( cfg. len( ) , BLOCK_CONFIG_SPACE_SIZE ) ;
687
687
for ( i, byte) in cfg. iter ( ) . enumerate ( ) {
688
- assert_eq ! ( * byte, ( num_sectors >> ( 8 * i) ) as u8 ) ;
688
+ assert_eq ! ( * byte, ( ( num_sectors >> ( 8 * i) ) & 0xff ) as u8 ) ;
689
689
}
690
690
// Testing `backing_file.virtio_block_disk_image_id()` implies
691
691
// duplicating that logic in tests, so skipping it.
@@ -707,7 +707,10 @@ mod tests {
707
707
708
708
let features: u64 = ( 1u64 << VIRTIO_F_VERSION_1 ) | ( 1u64 << VIRTIO_RING_F_EVENT_IDX ) ;
709
709
710
- assert_eq ! ( block. avail_features_by_page( 0 ) , features as u32 ) ;
710
+ assert_eq ! (
711
+ block. avail_features_by_page( 0 ) ,
712
+ ( features & 0xffffffff ) as u32 ,
713
+ ) ;
711
714
assert_eq ! ( block. avail_features_by_page( 1 ) , ( features >> 32 ) as u32 ) ;
712
715
713
716
for i in 2 ..10 {
Original file line number Diff line number Diff line change @@ -959,7 +959,10 @@ pub mod tests {
959
959
| 1 << VIRTIO_F_VERSION_1
960
960
| 1 << VIRTIO_RING_F_EVENT_IDX ;
961
961
962
- assert_eq ! ( net. avail_features_by_page( 0 ) , features as u32 ) ;
962
+ assert_eq ! (
963
+ net. avail_features_by_page( 0 ) ,
964
+ ( features & 0xFFFFFFFF ) as u32 ,
965
+ ) ;
963
966
assert_eq ! ( net. avail_features_by_page( 1 ) , ( features >> 32 ) as u32 ) ;
964
967
for i in 2 ..10 {
965
968
assert_eq ! ( net. avail_features_by_page( i) , 0u32 ) ;
Original file line number Diff line number Diff line change @@ -391,7 +391,10 @@ mod tests {
391
391
392
392
let features = 1 << VIRTIO_F_VERSION_1 ;
393
393
394
- assert_eq ! ( entropy_dev. avail_features_by_page( 0 ) , features as u32 ) ;
394
+ assert_eq ! (
395
+ entropy_dev. avail_features_by_page( 0 ) ,
396
+ ( features & 0xFFFFFFFF ) as u32 ,
397
+ ) ;
395
398
assert_eq ! (
396
399
entropy_dev. avail_features_by_page( 1 ) ,
397
400
( features >> 32 ) as u32
Original file line number Diff line number Diff line change @@ -707,7 +707,9 @@ mod tests {
707
707
assert_eq ! ( pkt. buf_addr. unwrap( ) . raw_value( ) , buf_desc. addr. get( ) ) ;
708
708
709
709
let zeros = vec ! [ 0_u8 ; pkt. buf_size( ) ] ;
710
- let data: Vec < u8 > = ( 0 ..pkt. buf_size ( ) ) . map ( |i| ( i % 0x100 ) as u8 ) . collect ( ) ;
710
+ let data: Vec < u8 > = ( 0 ..pkt. buf_size ( ) )
711
+ . map ( |i| ( ( i as u64 ) & 0xff ) as u8 )
712
+ . collect ( ) ;
711
713
for offset in 0 ..pkt. buf_size ( ) {
712
714
buf_desc. set_data ( & zeros) ;
713
715
You can’t perform that action at this time.
0 commit comments