gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[develop]: base: Fix VNC server initialization

YL
Yen-lin Lai (Gerrit)
Wed, Apr 19, 2023 5:42 AM

Yen-lin Lai has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/69757?usp=email )

Change subject: base: Fix VNC server initialization
......................................................................

base: Fix VNC server initialization

In a previous commit, the initialization of dataFd to -1 is removed.
Add it back so VNC server can properly accept connection.

Fixes: 67fb75d659 ("base,cpu,dev,sim: Pull common logic into
ListenSocket::listen().")
Change-Id: I4246d1fddc766cb190a04d4f984fc1ce73af3fb0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69757
Tested-by: kokoro noreply+kokoro@google.com
Reviewed-by: Gabe Black gabe.black@gmail.com
Maintainer: Gabe Black gabe.black@gmail.com

M src/base/vnc/vncserver.cc
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc
index f342419..4b1ddae 100644
--- a/src/base/vnc/vncserver.cc
+++ b/src/base/vnc/vncserver.cc
@@ -117,7 +117,7 @@
*/
VncServer::VncServer(const Params &p)
: VncInput(p), listenEvent(NULL), dataEvent(NULL), number(p.number),

  •  listener(p.port.build(p.name)),
    
  •  dataFd(-1), listener(p.port.build(p.name)),
      sendUpdate(false), supportsRawEnc(false), supportsResizeEnc(false)
    
    {
    if (p.port)

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69757?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings

Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I4246d1fddc766cb190a04d4f984fc1ce73af3fb0
Gerrit-Change-Number: 69757
Gerrit-PatchSet: 4
Gerrit-Owner: Yen-lin Lai yenlinlai@google.com
Gerrit-Reviewer: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Daniel Carvalho odanrc@yahoo.com.br
Gerrit-Reviewer: Gabe Black gabe.black@gmail.com
Gerrit-Reviewer: Gabe Black gabeblack@google.com
Gerrit-Reviewer: Yen-lin Lai yenlinlai@google.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com

Yen-lin Lai has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/69757?usp=email ) Change subject: base: Fix VNC server initialization ...................................................................... base: Fix VNC server initialization In a previous commit, the initialization of dataFd to -1 is removed. Add it back so VNC server can properly accept connection. Fixes: 67fb75d659 ("base,cpu,dev,sim: Pull common logic into ListenSocket::listen().") Change-Id: I4246d1fddc766cb190a04d4f984fc1ce73af3fb0 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69757 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Gabe Black <gabe.black@gmail.com> Maintainer: Gabe Black <gabe.black@gmail.com> --- M src/base/vnc/vncserver.cc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Gabe Black: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc index f342419..4b1ddae 100644 --- a/src/base/vnc/vncserver.cc +++ b/src/base/vnc/vncserver.cc @@ -117,7 +117,7 @@ */ VncServer::VncServer(const Params &p) : VncInput(p), listenEvent(NULL), dataEvent(NULL), number(p.number), - listener(p.port.build(p.name)), + dataFd(-1), listener(p.port.build(p.name)), sendUpdate(false), supportsRawEnc(false), supportsResizeEnc(false) { if (p.port) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/69757?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I4246d1fddc766cb190a04d4f984fc1ce73af3fb0 Gerrit-Change-Number: 69757 Gerrit-PatchSet: 4 Gerrit-Owner: Yen-lin Lai <yenlinlai@google.com> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Daniel Carvalho <odanrc@yahoo.com.br> Gerrit-Reviewer: Gabe Black <gabe.black@gmail.com> Gerrit-Reviewer: Gabe Black <gabeblack@google.com> Gerrit-Reviewer: Yen-lin Lai <yenlinlai@google.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>