virtmgr: remove carriage returns from VM console logcat
Most OS's, like Linux, include a \r when writing lines to a serial ports
or virtio-console. They don't belong in logcat, so strip them out before
calling `info!`.
I noticed this because I ran `adb -d logcat -v color -d | less -R` and
saw lots of '^M'.
Test: boot microdroid and check for \r in the logcat
Change-Id: I95407cc73cf1ad8f6754d97ec41f27de4a3ef17c
diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index b5b2108..d365e82 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -2012,9 +2012,13 @@
// EOF
return;
}
- Ok(size) => {
- if buf[size - 1] == b'\n' {
+ Ok(_size) => {
+ if buf.last() == Some(&b'\n') {
buf.pop();
+ // Logs sent via TTY usually end lines with "\r\n".
+ if buf.last() == Some(&b'\r') {
+ buf.pop();
+ }
}
info!("{}: {}", &tag, &String::from_utf8_lossy(&buf));
}