mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-18 10:59:16 +00:00
devices: use byte strings directly
Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
parent
bd8c28d341
commit
8aa2d7ab2a
@ -411,14 +411,11 @@ mod tests {
|
|||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
|
||||||
serial.write(0, DATA as u64, &[b'x', b'y']);
|
serial.write(0, DATA as u64, b"xy");
|
||||||
serial.write(0, DATA as u64, &[b'a']);
|
serial.write(0, DATA as u64, b"a");
|
||||||
serial.write(0, DATA as u64, &[b'b']);
|
serial.write(0, DATA as u64, b"b");
|
||||||
serial.write(0, DATA as u64, &[b'c']);
|
serial.write(0, DATA as u64, b"c");
|
||||||
assert_eq!(
|
assert_eq!(serial_out.buf.lock().unwrap().as_slice(), b"abc");
|
||||||
serial_out.buf.lock().unwrap().as_slice(),
|
|
||||||
&[b'a', b'b', b'c']
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -436,7 +433,7 @@ mod tests {
|
|||||||
// counter doesn't change (for 0 it blocks)
|
// counter doesn't change (for 0 it blocks)
|
||||||
assert!(intr_evt.write(1).is_ok());
|
assert!(intr_evt.write(1).is_ok());
|
||||||
serial.write(0, IER as u64, &[IER_RECV_BIT]);
|
serial.write(0, IER as u64, &[IER_RECV_BIT]);
|
||||||
serial.queue_input_bytes(&[b'a', b'b', b'c']).unwrap();
|
serial.queue_input_bytes(b"abc").unwrap();
|
||||||
|
|
||||||
assert_eq!(intr_evt.read().unwrap(), 2);
|
assert_eq!(intr_evt.read().unwrap(), 2);
|
||||||
|
|
||||||
@ -473,7 +470,7 @@ mod tests {
|
|||||||
// counter doesn't change (for 0 it blocks)
|
// counter doesn't change (for 0 it blocks)
|
||||||
assert!(intr_evt.write(1).is_ok());
|
assert!(intr_evt.write(1).is_ok());
|
||||||
serial.write(0, IER as u64, &[IER_THR_BIT]);
|
serial.write(0, IER as u64, &[IER_THR_BIT]);
|
||||||
serial.write(0, DATA as u64, &[b'a']);
|
serial.write(0, DATA as u64, b"a");
|
||||||
|
|
||||||
assert_eq!(intr_evt.read().unwrap(), 2);
|
assert_eq!(intr_evt.read().unwrap(), 2);
|
||||||
let mut data = [0u8];
|
let mut data = [0u8];
|
||||||
@ -515,9 +512,9 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
serial.write(0, MCR as u64, &[MCR_LOOP_BIT]);
|
serial.write(0, MCR as u64, &[MCR_LOOP_BIT]);
|
||||||
serial.write(0, DATA as u64, &[b'a']);
|
serial.write(0, DATA as u64, b"a");
|
||||||
serial.write(0, DATA as u64, &[b'b']);
|
serial.write(0, DATA as u64, b"b");
|
||||||
serial.write(0, DATA as u64, &[b'c']);
|
serial.write(0, DATA as u64, b"c");
|
||||||
|
|
||||||
let mut data = [0u8];
|
let mut data = [0u8];
|
||||||
serial.read(0, MSR as u64, &mut data[..]);
|
serial.read(0, MSR as u64, &mut data[..]);
|
||||||
|
@ -524,14 +524,11 @@ mod tests {
|
|||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
|
||||||
pl011.write(0, UARTDR, &[b'x', b'y']);
|
pl011.write(0, UARTDR, b"xy");
|
||||||
pl011.write(0, UARTDR, &[b'a']);
|
pl011.write(0, UARTDR, b"a");
|
||||||
pl011.write(0, UARTDR, &[b'b']);
|
pl011.write(0, UARTDR, b"b");
|
||||||
pl011.write(0, UARTDR, &[b'c']);
|
pl011.write(0, UARTDR, b"c");
|
||||||
assert_eq!(
|
assert_eq!(pl011_out.buf.lock().unwrap().as_slice(), b"xabc");
|
||||||
pl011_out.buf.lock().unwrap().as_slice(),
|
|
||||||
&[b'x', b'a', b'b', b'c']
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -549,7 +546,7 @@ mod tests {
|
|||||||
// write 1 to the interrupt event fd, so that read doesn't block in case the event fd
|
// write 1 to the interrupt event fd, so that read doesn't block in case the event fd
|
||||||
// counter doesn't change (for 0 it blocks)
|
// counter doesn't change (for 0 it blocks)
|
||||||
assert!(intr_evt.write(1).is_ok());
|
assert!(intr_evt.write(1).is_ok());
|
||||||
pl011.queue_input_bytes(&[b'a', b'b', b'c']).unwrap();
|
pl011.queue_input_bytes(b"abc").unwrap();
|
||||||
|
|
||||||
assert_eq!(intr_evt.read().unwrap(), 2);
|
assert_eq!(intr_evt.read().unwrap(), 2);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user