mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

qemurunner: Make create_socket() return data and use exceptions

Browse Source 
So that create_socket() can be called more than once to create sockets,
it now returns the socket and port rather than setting class variables
directly.

create_socket() now only uses exceptions for errors, not the return
value from the function.

(From OE-Core rev: b46d83a848cf23c7f639a6ebafbd0f2c1413584a)

Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Randy Witt
2015-08-20 10:55:17 -07:00
committed by Richard Purdie
parent 62585cff0d
commit 8d05d8a0c4
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/utils/qemurunner.py
+14 -13
View File
@@ -42,20 +42,18 @@ class QemuRunner:
self.runqemutime = 60
def create_socket(self):
try:
self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.server_socket.setblocking(0)
self.server_socket.bind(("127.0.0.1",0))
self.server_socket.listen(2)
self.serverport = self.server_socket.getsockname()[1]
logger.info("Created listening socket for qemu serial console on: 127.0.0.1:%s" % self.serverport)
return True
except socket.error, msg:
self.server_socket.close()
logger.error("Failed to create listening socket: %s" % msg[1])
return False
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setblocking(0)
sock.bind(("127.0.0.1",0))
sock.listen(2)
port = sock.getsockname()[1]
logger.info("Created listening socket for qemu serial console on: 127.0.0.1:%s" % port)
return (sock, port)
except socket.error:
sock.close()
raise
def log(self, msg):
if self.logfile:
@@ -82,7 +80,10 @@ class QemuRunner:
else:
os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
if not self.create_socket():
try:
self.server_socket, self.serverport = self.create_socket()
except socket.error, msg:
logger.error("Failed to create listening socket: %s" % msg[1])
return False
# Set this flag so that Qemu doesn't do any grabs as SDL grabs interact