Update for new version of vsock crate.
Test: m virtualizationservice
Change-Id: I7698b6fffb5bb310c50673da0da9357452c1111e
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 563fab0..973bfa3 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -63,7 +63,7 @@
use std::sync::{Arc, Mutex, Weak};
use tombstoned_client::{TombstonedConnection, DebuggerdDumpType};
use vmconfig::VmConfig;
-use vsock::{SockAddr, VsockListener, VsockStream};
+use vsock::{VsockListener, VsockStream};
use zip::ZipArchive;
pub const BINDER_SERVICE_IDENTIFIER: &str = "android.system.virtualizationservice";
@@ -268,7 +268,7 @@
}
fn handle_tombstone(stream: &mut VsockStream) -> Result<()> {
- if let Ok(SockAddr::Vsock(addr)) = stream.peer_addr() {
+ if let Ok(addr) = stream.peer_addr() {
info!("Vsock Stream connected to cid={} for tombstones", addr.cid());
}
let tb_connection =
@@ -499,7 +499,7 @@
}
Ok(s) => s,
};
- if let Ok(SockAddr::Vsock(addr)) = stream.peer_addr() {
+ if let Ok(addr) = stream.peer_addr() {
let cid = addr.cid();
let port = addr.port();
info!("payload stream connected from cid={}, port={}", cid, port);