summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-20 20:55:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:11:03 +0000
commit1889fb34554fc9fae9bc0a61109afb23ad09c3d3 (patch)
treeed98f00f1b8032557258cbbfed2a3516b3e99f01
parentef4c613ac1c9c9ec9c717a449152640e6f43e85c (diff)
downloadpoky-1889fb34554fc9fae9bc0a61109afb23ad09c3d3.tar.gz
runqemu: Ensure we process all tap devices
The regexp in the script misses some tap devices, e.g. we see output like: runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap25.lock failed: [Errno 11] Resource temporarily unavailable runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap26.lock failed: [Errno 11] Resource temporarily unavailable runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap27.lock failed: [Errno 11] Resource temporarily unavailable runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap28.lock failed: [Errno 11] Resource temporarily unavailable runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap40.lock failed: [Errno 11] Resource temporarily unavailable runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap41.lock failed: [Errno 11] Resource temporarily unavailable What happened to tap29 to tap39? The issue is was we were missing devices with '0' in the number, like "10:" and so on in the output from "ip link". (From OE-Core rev: 6447697a48e3b693ee38806bc2ba07c2a65c2bc8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index fe4459dfb8..ad88da38df 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -923,7 +923,7 @@ class BaseConfig(object):
923 logger.debug('Running %s...' % cmd) 923 logger.debug('Running %s...' % cmd)
924 ip_link = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') 924 ip_link = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
925 # Matches line like: 6: tap0: <foo> 925 # Matches line like: 6: tap0: <foo>
926 possibles = re.findall('^[1-9]+: +(tap[0-9]+): <.*', ip_link, re.M) 926 possibles = re.findall('^[0-9]+: +(tap[0-9]+): <.*', ip_link, re.M)
927 tap = "" 927 tap = ""
928 for p in possibles: 928 for p in possibles:
929 lockfile = os.path.join(lockdir, p) 929 lockfile = os.path.join(lockdir, p)