commit 46429a98b94b6cafc58cd7fb986f8b5ba7e52214
author Jorge E. Moreira <jemoreira@google.com> Tue Feb 12 17:21:32 2019 -0800
committer Jorge E. Moreira <jemoreira@google.com> Wed Feb 13 14:01:56 2019 -0800
tree 8c0230087cf9339459f972679930ffd947a40087
parent ae3163fcbe70a1bfdff8058a05934ab89e2fe9c2

Set up network interfaces when running with crosvm

Bug: 124124441
Test: run locally, verify network interfaces are present
Change-Id: I92faefea13ad36881e7cf910a8b3b7c8dadd8326

host/libs/vm_manager/crosvm_manager.cpp

diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index ba09257..06d881e 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -21,6 +21,7 @@
 
 #include <glog/logging.h>
 
+#include "common/libs/utils/network.h"
 #include "common/libs/utils/subprocess.h"
 #include "host/libs/config/cuttlefish_config.h"
 #include "host/libs/vm_manager/qemu_manager.h"
@@ -38,6 +39,16 @@
                                           SOCK_STREAM);
 }
 
+void AddTapFdParameter(cvd::Command* crosvm_cmd, const std::string& tap_name) {
+  auto tap_fd = cvd::OpenTapInterface(tap_name);
+  if (tap_fd->IsOpen()) {
+    crosvm_cmd->AddParameter("--tap-fd=", tap_fd);
+  } else {
+    LOG(ERROR) << "Unable to connect to " << tap_name << ": "
+               << tap_fd->StrError();
+  }
+}
+
 }  // namespace
 
 const std::string CrosvmManager::name() { return "crosvm"; }
@@ -73,6 +84,9 @@
   command.AddParameter("--socket=", GetControlSocketPath(config_));
   command.AddParameter("--android-fstab=", config_->gsi_fstab_path());
 
+  AddTapFdParameter(&command, config_->wifi_tap_name());
+  AddTapFdParameter(&command, config_->mobile_tap_name());
+
   // TODO remove this (use crosvm's seccomp files)
   command.AddParameter("--disable-sandbox");