summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-06-28 11:27:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-09 10:53:45 +0100
commit88a6eb8027ae999fb53362d864301a3d525877d3 (patch)
tree3c68965bb36b149ddd6df503233d4340788e2ae3 /scripts
parent962c0a1fc0694403b385a6f11d710c8675399352 (diff)
downloadast2050-yocto-poky-88a6eb8027ae999fb53362d864301a3d525877d3.zip
ast2050-yocto-poky-88a6eb8027ae999fb53362d864301a3d525877d3.tar.gz
lib/oeqa/utils/qemurunner.py: class to handle qemu instance
Handles qemu instances (launch, kill, restart, serial connection, logging) Launch is blocking until login prompt and returns to the task. A qemu serial connection is used to save the boot log and get the ip from the image. Changed runqemu script not to error out when using custom serial option. (From OE-Core rev: ee7d64dfcc02ba8f568b17d181e0a58d3c810076) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index f2eb2e1..406092b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -156,7 +156,7 @@ while true; do
serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'`
kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'`
[ ! -z "$serial_option" -o ! -z "$kvm_option" ] && \
- error "Please use simplified serial or kvm options instead"
+ echo "Please use simplified serial or kvm options instead"
;;
"bootparams="*)
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT ${arg##bootparams=}"
OpenPOWER on IntegriCloud