diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-08-23 13:45:21 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-25 14:41:53 +0100 |
| commit | 8d5e6999caff50a4b7d9a9ba69f9875285270459 (patch) | |
| tree | f42d493495fefff3979f91aac40a85755ec14bac /scripts | |
| parent | 1c4d7a04ff47c5b5e6fa4f689f60f7178192873b (diff) | |
| download | openembedded-core-8d5e6999caff50a4b7d9a9ba69f9875285270459.tar.gz openembedded-core-8d5e6999caff50a4b7d9a9ba69f9875285270459.tar.bz2 openembedded-core-8d5e6999caff50a4b7d9a9ba69f9875285270459.zip | |
runqemu: Move the KVM check after the MACHINE/KERNEL Checks
The MACHINE/KERNEL Checks setup MACHINE is it's unset, the KVM checks valid
MACHINE is qemux86 or qemux86-64 and fail if it's unset!
[YOCTO #2970]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/runqemu | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 290f9ccce5..a3c35091b4 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -191,6 +191,22 @@ elif [ ! -w /dev/net/tun ] ; then exit 1 fi +# Report errors for missing combinations of options +if [ -z "$MACHINE" -a -z "$KERNEL" ]; then + error "you must specify at least a MACHINE or KERNEL argument" +fi +if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then + error "NFS booting without an explicit ROOTFS path is not yet supported" +fi + +if [ -z "$MACHINE" ]; then + MACHINE=`basename $KERNEL | sed 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'` + if [ -z "$MACHINE" ]; then + error "Unable to set MACHINE from kernel filename [$KERNEL]" + fi + echo "Set MACHINE to [$MACHINE] based on kernel [$KERNEL]" +fi + YOCTO_KVM_WIKI="https://wiki.yoctoproject.org/wiki/How_to_enable_KVM_for_Poky_qemu" # Detect KVM configuration if [ "x$KVM_ENABLED" = "xyes" ]; then @@ -220,21 +236,6 @@ if [ "x$KVM_ENABLED" = "xyes" ]; then fi fi -# Report errors for missing combinations of options -if [ -z "$MACHINE" -a -z "$KERNEL" ]; then - error "you must specify at least a MACHINE or KERNEL argument" -fi -if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then - error "NFS booting without an explicit ROOTFS path is not yet supported" -fi - -if [ -z "$MACHINE" ]; then - MACHINE=`basename $KERNEL | sed 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'` - if [ -z "$MACHINE" ]; then - error "Unable to set MACHINE from kernel filename [$KERNEL]" - fi - echo "Set MACHINE to [$MACHINE] based on kernel [$KERNEL]" -fi machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'` # MACHINE is now set for all cases |