From: Joshua Lock <joshua.g.lock@intel.com>
Date: Wed, 21 Sep 2016 13:06:56 +0000 (+0100)
Subject: runqemu: validate paths and attempt to infer unset paths
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0066e9094d7f4a0fc2db37bfb5625ec73cec1b98;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

runqemu: validate paths and attempt to infer unset paths

We need to validate and ensure all paths are set regardless of
whether runqemu was invoked with a .qemuboot.conf file or
otherwise. Split this logic out into a separate method called
during check_and_set()

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index 08dc3069214..5170d875707 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -536,6 +536,7 @@ class BaseConfig(object):
 
     def check_and_set(self):
         """Check configs sanity and set when needed"""
+        self.validate_paths()
         check_tun()
         # Check audio
         if self.audio_enabled:
@@ -598,6 +599,8 @@ class BaseConfig(object):
             k_upper = k.upper()
             self.set(k_upper, v)
 
+    def validate_paths(self):
+        """Ensure all relevant path variables are set"""
         # When we're started with a *.qemuboot.conf arg assume that image
         # artefacts are relative to that file, rather than in whatever
         # directory DEPLOY_DIR_IMAGE in the conf file points to.