commit a7a1ee645f970d5d057411aaa33f9818777fc97c
author Roman Kiryanov <rkir@google.com> Wed Apr 15 16:05:17 2020 -0700
committer Roman Kiryanov <rkir@google.com> Thu Apr 30 14:37:14 2020 -0700
tree 0ad62b617b2f2caea8817e3fcd858274cc99a3c4
parent 017f41f6c196511dbc3ae14f64483c10d68d1dec

Use qemu_pipe_write_fully in QemuPipeStream

Bug: 154346346
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Merged-In: I34531818d3d7301454a0b8890163a10cd0f11afb
Change-Id: I0832db41ce1cde2802f5c2a27f40af389ac59379

system/OpenglSystemCommon/QemuPipeStream.cpp

diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp
index 842e65f..e71821f 100644
--- a/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -105,43 +105,7 @@
 
 int QemuPipeStream::writeFully(const void *buf, size_t len)
 {
-    //DBG(">> QemuPipeStream::writeFully %d\n", len);
-    if (!valid()) return -1;
-    if (!buf) {
-       if (len>0) {
-            // If len is non-zero, buf must not be NULL. Otherwise the pipe would be
-            // in a corrupted state, which is lethal for the emulator.
-           ERR("QemuPipeStream::writeFully failed, buf=NULL, len %zu,"
-                   " lethal error, exiting", len);
-           abort();
-       }
-       return 0;
-    }
-
-    size_t res = len;
-    int retval = 0;
-
-    while (res > 0) {
-        ssize_t stat = qemu_pipe_write(m_sock, (const char *)(buf) + (len - res), res);
-        if (stat > 0) {
-            res -= stat;
-            continue;
-        }
-        if (stat == 0) { /* EOF */
-            ERR("QemuPipeStream::writeFully failed: premature EOF\n");
-            retval = -1;
-            break;
-        }
-        if (qemu_pipe_try_again(stat)) {
-            continue;
-        }
-        retval =  stat;
-        ERR("QemuPipeStream::writeFully failed: %s, lethal error, exiting.\n",
-                strerror(errno));
-        abort();
-    }
-    //DBG("<< QemuPipeStream::writeFully %d\n", len );
-    return retval;
+    return qemu_pipe_write_fully(m_sock, buf, len);
 }
 
 QEMU_PIPE_HANDLE QemuPipeStream::getSocket() const {