commit e2170d286ecb19ddcb0cff9912bf0b7150238e17
author Yusuke Sato <yusukes@google.com> Tue Jun 11 15:08:44 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Jun 19 23:28:06 2019 +0000
tree 88bbcc54e07e8c3d09de7919dc6bf3bd691a0bff
parent 506686f7382c0d621a8e5d3b6ceefa77c6ae8e63

arc: Drop support for 9999/vsock

BUG=b:134095377
TEST=arcvm still starts

Change-Id: I7d7c09fa3c7c35f5d791f9e250aadffaf558c9f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/1653871
Tested-by: Yusuke Sato <yusukes@chromium.org>
Auto-Submit: Yusuke Sato <yusukes@chromium.org>
Commit-Queue: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>

arc/vm/vsock_proxy/client_proxy.cc

diff --git a/arc/vm/vsock_proxy/client_proxy.cc b/arc/vm/vsock_proxy/client_proxy.cc
index a48fd3c..0ffb0e2 100644
--- a/arc/vm/vsock_proxy/client_proxy.cc
+++ b/arc/vm/vsock_proxy/client_proxy.cc
@@ -33,8 +33,6 @@
 
 // Port for VSOCK.
 constexpr unsigned int kVSockPort = 9900;
-// TODO(yusukes): Remove this later.
-constexpr unsigned int kVSockOldPort = 9999;
 
 base::ScopedFD ConnectVSock() {
   LOG(INFO) << "Creating VSOCK...";
@@ -43,14 +41,7 @@
   sa.svm_cid = VMADDR_CID_HOST;
   sa.svm_port = kVSockPort;
 
-  // TODO(yusukes): Remove this later.
-  struct sockaddr_vm sa_old = {};
-  sa_old.svm_family = AF_VSOCK;
-  sa_old.svm_cid = VMADDR_CID_HOST;
-  sa_old.svm_port = kVSockOldPort;
-
   // TODO(hidehiko): Consider to time out.
-  uint32_t counter = 0;
   while (true) {
     base::ScopedFD fd(
         socket(AF_VSOCK, SOCK_STREAM | SOCK_CLOEXEC, 0 /* protocol */));
@@ -60,13 +51,11 @@
     }
 
     LOG(INFO) << "Connecting VSOCK";
-    const auto& sa_to_use = (counter++ < 3) ? sa : sa_old;
-    if (HANDLE_EINTR(connect(
-            fd.get(), reinterpret_cast<const struct sockaddr*>(&sa_to_use),
-            sizeof(struct sockaddr_vm))) == -1) {
+    if (HANDLE_EINTR(connect(fd.get(),
+                             reinterpret_cast<const struct sockaddr*>(&sa),
+                             sizeof(sa))) == -1) {
       fd.reset();
-      PLOG(ERROR) << "Failed to connect to port " << sa_to_use.svm_port
-                  << ". Waiting and then retry...";
+      PLOG(ERROR) << "Failed to connect. Waiting and then retry...";
       sleep(1);  // Arbitrary wait.
       continue;
     }