Patchwork [1/1] runqemu: add ability to skip using an existing tap device

login
register
mail settings
Submitter Scott Garman
Date Feb. 15, 2014, 7:04 p.m.
Message ID <bb53744a8568261f4cb548df08e7332aa8389edd.1392490959.git.scott.a.garman@intel.com>
Download mbox | patch
Permalink /patch/66803/
State Accepted
Commit 46bc59d87da18d7cd2d8d25fe96263efe5e57590
Headers show

Comments

Scott Garman - Feb. 15, 2014, 7:04 p.m.
Support the sitauation where a user could have another VM running
which uses tap devices. To prevent runqemu from trying to use the
same tap device, runqemu will skip using a tap device if it finds
a filename tapX.skip within its lock directory.

This fixes [YOCTO #5815]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 scripts/runqemu-internal | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index f9ca380..d317dfd 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -178,6 +178,10 @@  else
         USE_PRECONF_TAP="no"
         for tap in $POSSIBLE; do
             LOCKFILE="$LOCKDIR/$tap"
+            if [ -e "$LOCKFILE.skip" ]; then
+                echo "Found $LOCKFILE.skip, skipping $tap"
+                continue
+            fi
             echo "Acquiring lockfile for $tap..."
             acquire_lock $LOCKFILE
             if [ $? -eq 0 ]; then
@@ -214,7 +218,7 @@  else
             fi 
         else
             echo "Using preconfigured tap device '$TAP'"
-            echo "If this is not intended, use flock on $LOCKFILE.lock to make runqemu skip $TAP."
+            echo "If this is not intended, touch $LOCKFILE.skip to make runqemu skip $TAP."
         fi
 
         cleanup() {