commit c3edd0cb04f5d37a40137ca80538637470e0ce20
author Joshua Duong <joshuaduong@google.com> Tue Dec 13 08:07:55 2022 -0800
committer Joshua Duong <joshuaduong@google.com> Wed Dec 28 21:18:35 2022 -0800
tree dd0707feed61ad5e0f3b88b7c3b29df5dafc4de4
parent 39e1fa0c4cc6e925c758056b01a6d4686151708f

Host-common refactor.

Bug: 237805597
Test: presubmit
Change-Id: I695a5dd2fbe06ea0e635c70b006df7eca7de318c

stream-servers/virtio-gpu-gfxstream-renderer.cpp

diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index ac47d62..670ac83 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -727,8 +727,8 @@
                     .createRenderThread = true,
                     .externalAddr = resEntry.hva,
                     .externalAddrSize = resEntry.hvaSize,
-                    .contextId = ctxId,
-                    .capsetId = ctxEntry.capsetId,
+                    .virtioGpuContextId = ctxId,
+                    .virtioGpuCapsetId = ctxEntry.capsetId,
                     .contextName = name.c_str(),
                     .contextNameSize = static_cast<uint32_t>(ctxEntry.name.size()),
                 };
@@ -1904,11 +1904,11 @@
 static const GoldfishPipeServiceOps goldfish_pipe_service_ops = {
     // guest_open()
     [](GoldfishHwPipe* hwPipe) -> GoldfishHostPipe* {
-        return static_cast<GoldfishHostPipe*>(android_pipe_guest_open(hwPipe));
+        return static_cast<GoldfishHostPipe*>(android_pipe_guest_open(hwPipe, nullptr));
     },
     // guest_open_with_flags()
     [](GoldfishHwPipe* hwPipe, uint32_t flags) -> GoldfishHostPipe* {
-        return static_cast<GoldfishHostPipe*>(android_pipe_guest_open_with_flags(hwPipe, flags));
+        return static_cast<GoldfishHostPipe*>(android_pipe_guest_open_with_flags(hwPipe, flags, nullptr));
     },
     // guest_close()
     [](GoldfishHostPipe* hostPipe, GoldfishPipeCloseReason reason) {