aboutsummaryrefslogtreecommitdiff
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-12-04 17:14:34 +0000
commitec1481f7ad6f2b3d1420027327510bec94dd66a8 (patch)
treedbc03ead416601de1ed231a26c34a9940c4df40b
parent866ead1d900433e39772973b4b31b7408ed8a215 (diff)
downloadopenembedded-core-ec1481f7ad6f2b3d1420027327510bec94dd66a8.zip
openembedded-core-ec1481f7ad6f2b3d1420027327510bec94dd66a8.tar.gz
openembedded-core-ec1481f7ad6f2b3d1420027327510bec94dd66a8.tar.bz2
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". Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6447697a48e3b693ee38806bc2ba07c2a65c2bc8) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rwxr-xr-xscripts/runqemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 0558d1d..6ea370d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -923,7 +923,7 @@ class BaseConfig(object):
logger.debug('Running %s...' % cmd)
ip_link = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
# Matches line like: 6: tap0: <foo>
- possibles = re.findall('^[1-9]+: +(tap[0-9]+): <.*', ip_link, re.M)
+ possibles = re.findall('^[0-9]+: +(tap[0-9]+): <.*', ip_link, re.M)
tap = ""
for p in possibles:
lockfile = os.path.join(lockdir, p)