NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

viewers: Centralize viewer FD opening

Browse Source 
Put all the logic into _get_fd_for_open. May help centralize future
improvements, like catching lack of openGraphicsFD support
This commit is contained in:
Cole Robinson 2016-05-07 17:53:10 -04:00
parent 7e34b022af
commit bd725d6cfe
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
virtManager/viewers.py
View File

@ -134,13 +134,15 @@ class Viewer(vmmGObject):
def _get_pixbuf(self):
return self._display.get_pixbuf()
def _open(self):
def _get_fd_for_open(self):
if self._ginfo.need_tunnel():
self._open_fd(self._tunnels.open_new())
return
connfd = self._ginfo.get_conn_fd()
if connfd != -1:
self._open_fd(connfd)
return self._tunnels.open_new()
return self._ginfo.get_conn_fd()
def _open(self):
fd = self._get_fd_for_open()
if fd != -1:
self._open_fd(fd)
else:
self._open_host()
@ -553,11 +555,6 @@ class SpiceViewer(Viewer):
self._tunnels.unlock()
def _channel_open_fd_request(self, channel, tls_ignore):
if not self._ginfo.need_tunnel():
connfd = self._ginfo.get_conn_fd()
channel.open_fd(connfd)
return
if not self._tunnels:
# Can happen if we close the details window and clear self._tunnels
# while initially connecting to spice and channel FD requests
@ -567,7 +564,7 @@ class SpiceViewer(Viewer):
logging.debug("Requesting tunnel for channel: %s", channel)
channel.connect_after("channel-event", self._fd_channel_event_cb)
fd = self._tunnels.open_new()
fd = self._get_fd_for_open()
channel.open_fd(fd)
def _channel_new_cb(self, session, channel):