From nobody Sat May 18 06:50:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575514205; cv=none; d=zohomail.com; s=zohoarc; b=debTryYEvFwr76OdSsS9erVB38c5Vps2T5qbU70vVSswfQHgbH5iMjdF6ahc7FdLCf+ZnsqZRISVEcOuvpfXeMLtCLz5J0eh2UuW/QjcqBPNmOgdL5IYqRVqdFK5ILl6PrP75UMFBibB8rY5NYpcFqOEhh/7YiTYI3v5ihaXtqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575514205; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=NGHZZjPA7/Fhrh2YNKMXXBFjXsWVRj7olDJRMs5n9eM=; b=jQaGO4GDhXt2i7QNrXTbUCwJKUf4uTwvJJpqPsBgt4CDBka3i/jokHG/pSQ3heLLyCLWB6jr8avMM7QkRq4AJgfn+TeMWrPDojQKv5ACo6kOxEGshppNvy5k3bc9aH9Cmuj7MNv+jjJBvBGFKmgy8rqwEKz/RmR7dctIvV709G4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575514205850199.4128751268263; Wed, 4 Dec 2019 18:50:05 -0800 (PST) Received: from localhost ([::1]:49176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ichDP-0008Iy-EY for importer@patchew.org; Wed, 04 Dec 2019 21:50:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44332) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ichCL-0007OR-28 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 21:48:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ichCI-0006mu-NU for qemu-devel@nongnu.org; Wed, 04 Dec 2019 21:48:55 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37360 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ichCI-0006jB-5k for qemu-devel@nongnu.org; Wed, 04 Dec 2019 21:48:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355-xP2MoCgKODG-rHAC37hX9A-1; Wed, 04 Dec 2019 21:48:52 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 051F4801E53; Thu, 5 Dec 2019 02:48:51 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-12-175.pek2.redhat.com [10.72.12.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0282C5C1B0; Thu, 5 Dec 2019 02:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575514133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NGHZZjPA7/Fhrh2YNKMXXBFjXsWVRj7olDJRMs5n9eM=; b=dGxetJkVctm3IXOdgjWOsRrCgCGUKTFn5kbSFDWoVtkozLX3B1qhTQHsC4IA7lBtDmJjY8 uNG1s31iywDg6nnD/JaJcyPR/z/bagzjataebwoEPZIlAaoc1EaUjVjz7Leh+5JEPFJ5z0 xbNXRMvhd19oT+f8GSCYXKrgwYNazQY= From: Han Han To: qemu-devel@nongnu.org Subject: [PATCH v2] Revert "qemu-options.hx: Update for reboot-timeout parameter" Date: Thu, 5 Dec 2019 10:48:21 +0800 Message-Id: <20191205024821.245435-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: xP2MoCgKODG-rHAC37hX9A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Han Han , laurent@vivier.eu, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8. In 20a1922032 we allowed reboot-timeout=3D-1 again, so update the doc accordingly. Signed-off-by: Han Han Reviewed-by: Markus Armbruster --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 65c9473b..e14d88e9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -327,8 +327,8 @@ format(true color). The resolution should be supported = by the SVGA mode, so the recommended is 320x240, 640x480, 800x640. =20 A timeout could be passed to bios, guest will pause for @var{rb_timeout} ms -when boot failed, then reboot. If @option{reboot-timeout} is not set, -guest will not reboot by default. Currently Seabios for X86 +when boot failed, then reboot. If @var{rb_timeout} is '-1', guest will not +reboot, qemu passes '-1' to bios by default. Currently Seabios for X86 system support it. =20 Do strict boot via @option{strict=3Don} as far as firmware/BIOS --=20 2.23.0