diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-08-06 18:44:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-18 19:22:22 +0100 |
commit | d6dcddbb3d720ae641bc1218a7cbd73a5c9f31ca (patch) | |
tree | 4bd48c629d3a206617ce11846d663f9c2a5fa67f /meta/lib/oeqa/utils/qemurunner.py | |
parent | 1c65b4bdd8908e5b5e025fb6f4c43dfc938ce2e9 (diff) | |
download | poky-d6dcddbb3d720ae641bc1218a7cbd73a5c9f31ca.tar.gz |
qemurunner: Improves checking for server and target IPs on qemus parameters
Fixes OS hanging infinitely waiting for qemus process to release bitbake.lock
(From OE-Core master rev: d168bf34c553dbe5de7511e158cd83869d7a88bc)
(From OE-Core rev: b19f599fe8d06d9381ae774f3289fa8c054ad1cc)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index f12e65d1b0..16cf0e09c5 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -107,14 +107,17 @@ class QemuRunner: | |||
107 | cmdline = '' | 107 | cmdline = '' |
108 | with open('/proc/%s/cmdline' % self.qemupid) as p: | 108 | with open('/proc/%s/cmdline' % self.qemupid) as p: |
109 | cmdline = p.read() | 109 | cmdline = p.read() |
110 | ips = re.findall("((?:[0-9]{1,3}\.){3}[0-9]{1,3})", cmdline.split("ip=")[1]) | 110 | try: |
111 | if not ips or len(ips) != 3: | 111 | ips = re.findall("((?:[0-9]{1,3}\.){3}[0-9]{1,3})", cmdline.split("ip=")[1]) |
112 | if not ips or len(ips) != 3: | ||
113 | raise ValueError | ||
114 | else: | ||
115 | self.ip = ips[0] | ||
116 | self.server_ip = ips[1] | ||
117 | except IndexError, ValueError: | ||
112 | logger.info("Couldn't get ip from qemu process arguments! Here is the qemu command line used: %s" % cmdline) | 118 | logger.info("Couldn't get ip from qemu process arguments! Here is the qemu command line used: %s" % cmdline) |
113 | self.stop() | 119 | self.stop() |
114 | return False | 120 | return False |
115 | else: | ||
116 | self.ip = ips[0] | ||
117 | self.server_ip = ips[1] | ||
118 | logger.info("Target IP: %s" % self.ip) | 121 | logger.info("Target IP: %s" % self.ip) |
119 | logger.info("Server IP: %s" % self.server_ip) | 122 | logger.info("Server IP: %s" % self.server_ip) |
120 | logger.info("Waiting at most %d seconds for login banner" % self.boottime) | 123 | logger.info("Waiting at most %d seconds for login banner" % self.boottime) |