commit a89fc131319f9e78755ab214a97e8be9ce72d8fc
author Andrew Walbran <qwandor@google.com> Wed Mar 17 17:08:36 2021 +0000
committer Andrew Walbran <qwandor@google.com> Thu Mar 18 12:00:44 2021 +0000
tree 613640844173657c22e1820bffeddabc8d35c14e
parent 22c92a96996f65f96b49aa5738c4a6d040a99d47

Allow client to pass a file descriptor for VM logs.

Bug: 180893082
Test: Ran vm tool on VIM3L
Test: atest VirtualizationTestCases
Change-Id: I6c7729eb01d953559e1ddb0b5eb84655a84159a8

tests/vsock_test.cc

diff --git a/tests/vsock_test.cc b/tests/vsock_test.cc
index 74e984f..57a03ca 100644
--- a/tests/vsock_test.cc
+++ b/tests/vsock_test.cc
@@ -21,6 +21,7 @@
 #include <linux/vm_sockets.h>
 
 #include <iostream>
+#include <optional>
 
 #include "android-base/file.h"
 #include "android-base/logging.h"
@@ -57,7 +58,7 @@
     ASSERT_EQ(ret, 0) << strerror(errno);
 
     sp<IVirtualMachine> vm;
-    status = mVirtManager->startVm(String16(kVmConfigPath), &vm);
+    status = mVirtManager->startVm(String16(kVmConfigPath), std::nullopt, &vm);
     ASSERT_TRUE(status.isOk()) << "Error starting VM: " << status;
 
     int32_t cid;