commit 03bdc4ebb71a663910edfa8df58c84dbd698107c
author Tomasz Wiszkowski <ender@google.com> Fri Jul 07 11:42:00 2017 -0700
committer Greg Hartman <ghartman@google.com> Mon Oct 09 17:29:28 2017 -0700
tree c7c750a7b209b767650dc738b3cb14653ccc1c85
parent c2b7f94f6752806b78acdce88edb2be9aa76cf71

Fix ivserver checking logic for channels

Change-Id: Ia414417b4699daa335143382c24f3636364f6c7a
(cherry picked from commit 2ab0ba471dc1f62fdc0ff957860be6deb885eb54)

ivserver/ivserver.cc

diff --git a/ivserver/ivserver.cc b/ivserver/ivserver.cc
index a3e3a30..76225d1 100644
--- a/ivserver/ivserver.cc
+++ b/ivserver/ivserver.cc
@@ -19,9 +19,9 @@
           options.qemu_socket_path.c_str(), false, SOCK_STREAM, 0666)),
       client_channel_(avd::SharedFD::SocketLocalServer(
           options.client_socket_path.c_str(), false, SOCK_STREAM, 0666)) {
-  LOG_IF(FATAL, qemu_channel_->IsOpen())
+  LOG_IF(FATAL, !qemu_channel_->IsOpen())
       << "Could not create QEmu channel: " << qemu_channel_->StrError();
-  LOG_IF(FATAL, client_channel_->IsOpen())
+  LOG_IF(FATAL, !client_channel_->IsOpen())
       << "Could not create Client channel: " << client_channel_->StrError();
 }
 

ivserver/qemu_client.cc

diff --git a/ivserver/qemu_client.cc b/ivserver/qemu_client.cc
index 83164ec..fc29e26 100644
--- a/ivserver/qemu_client.cc
+++ b/ivserver/qemu_client.cc
@@ -27,6 +27,7 @@
 // Once the QemuClient object is constructed, invoking the following
 // method will perform the actual handshake with a QEMU instance.
 bool QemuClient::PerformHandshake(const VSoCSharedMemory& shmem) {
+  LOG(INFO) << "New QEmu client connected.";
   // 1. The protocol version number, currently zero.  The client should
   //    close the connection on receipt of versions it can't handle.
   int64_t msg = QemuConstants::kIvshMemProtocolVersion;
@@ -85,6 +86,7 @@
     }
   }
 
+  LOG(INFO) << "QEmu handshake completed.";
   return true;
 }