MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/runqemu: split lock dir creation into a reusable function

Browse Source 
(From OE-Core rev: 004d6bcb067ecf1d796801fa43a98820c4efd3c7)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2023-06-14 15:00:46 +02:00 committed by Richard Purdie
parent d9cf8973d0
commit 5776d07bdd
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/runqemu
View File

@ -1087,6 +1087,17 @@ to your build configuration.
self.set('NETWORK_CMD', '-netdev bridge,br=%s,id=net0,helper=%s -device virtio-net-pci,netdev=net0 ' % ( self.set('NETWORK_CMD', '-netdev bridge,br=%s,id=net0,helper=%s -device virtio-net-pci,netdev=net0 ' % (
self.net_bridge, os.path.join(self.bindir_native, 'qemu-oe-bridge-helper'))) self.net_bridge, os.path.join(self.bindir_native, 'qemu-oe-bridge-helper')))
def make_lock_dir(self, lockdir):
if not os.path.exists(lockdir):
# There might be a race issue when multi runqemu processess are
# running at the same time.
try:
os.mkdir(lockdir)
os.chmod(lockdir, 0o777)
except FileExistsError:
pass
return
def setup_slirp(self): def setup_slirp(self):
"""Setup user networking""" """Setup user networking"""
@ -1105,14 +1116,7 @@ to your build configuration.
mac = 2 mac = 2
lockdir = "/tmp/qemu-port-locks" lockdir = "/tmp/qemu-port-locks"
if not os.path.exists(lockdir): self.make_lock_dir(lockdir)
# There might be a race issue when multi runqemu processess are
# running at the same time.
try:
os.mkdir(lockdir)
os.chmod(lockdir, 0o777)
except FileExistsError:
pass
# Find a free port to avoid conflicts # Find a free port to avoid conflicts
for p in ports[:]: for p in ports[:]:
@ -1152,14 +1156,7 @@ to your build configuration.
logger.error("ip: %s" % ip) logger.error("ip: %s" % ip)
raise OEPathError("runqemu-ifup, runqemu-ifdown or ip not found") raise OEPathError("runqemu-ifup, runqemu-ifdown or ip not found")
if not os.path.exists(lockdir): self.make_lock_dir(lockdir)
# There might be a race issue when multi runqemu processess are
# running at the same time.
try:
os.mkdir(lockdir)
os.chmod(lockdir, 0o777)
except FileExistsError:
pass
cmd = (ip, 'link') cmd = (ip, 'link')
logger.debug('Running %s...' % str(cmd)) logger.debug('Running %s...' % str(cmd))