From ee7d64dfcc02ba8f568b17d181e0a58d3c810076 Mon Sep 17 00:00:00 2001 From: Radu Moisan Date: Fri, 28 Jun 2013 11:27:56 +0300 Subject: 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. Signed-off-by: Radu Moisan Signed-off-by: Stefan Stanacar --- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index f2eb2e1768..406092be3c 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=}" -- cgit v1.2.3