diff --git a/tool/run/log/qemu b/tool/run/log/qemu
index f7aa14d9e5..82782e799c 100644
--- a/tool/run/log/qemu
+++ b/tool/run/log/qemu
@@ -14,7 +14,11 @@ proc run_log { wait_for_re timeout_value } {
 
 	set kernel_msg [run_boot_string]
 
-	set timeout $timeout_value
+	if {$wait_for_re == "forever"} {
+		set timeout -1
+	} else {
+		set timeout $timeout_value
+	}
 
 	expect {
 		-i $output_spawn_id $kernel_msg { }