From nobody Fri May 3 00:53:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1572820026; cv=none; d=zoho.com; s=zohoarc; b=aKDPwdz5zYbvC+y+Cwn/ZG3peHW3wPxtkJ/tV6vPSs+vy/CNjyBg5ZDdVzQAnBx4nzV5gIMjb5d4aGy/xKl5urVPvc+ArDaGNNeT1QbnCWo4kQzj+hsnNhnmUJQZWHnb6BkllsYG+y1Gfm6qapeP2+x0h4OCcsn3fvuDjgnhlIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572820026; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CLHKIKG3hHAjCkZGDoKRl5er4nims8GO1xNI5OW3jBU=; b=lWCAyik/QWkkDUbVHAqjj4wNU+lXidpLukU3vzBUNNuly1FYWYojbL4pKxFvEs5cgYsesGOltihJRRuPzEjYqy5aBVn7KStlP/oXkv7P8BSRCA/i8vruWVR5DWvcktD+0yg+Y9HxEgjiZSTPsU0odJIZb9ayyHcR+s/TQxPVIHc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572820026106844.3458094473986; Sun, 3 Nov 2019 14:27:06 -0800 (PST) Received: from localhost ([::1]:56676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iROKr-0005ZB-5N for importer@patchew.org; Sun, 03 Nov 2019 17:27:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iROJO-0004Rn-8B for qemu-devel@nongnu.org; Sun, 03 Nov 2019 17:25:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iROJN-0002R5-4q for qemu-devel@nongnu.org; Sun, 03 Nov 2019 17:25:30 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:57847 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iROJN-0002QF-1Y for qemu-devel@nongnu.org; Sun, 03 Nov 2019 17:25:29 -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-69-jsTQzBuaNjK4ulIjNxu8zg-1; Sun, 03 Nov 2019 17:25:25 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7E3F800C61 for ; Sun, 3 Nov 2019 22:25:24 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-75.brq.redhat.com [10.40.204.75]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6992B600C1; Sun, 3 Nov 2019 22:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572819928; 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: in-reply-to:in-reply-to:references:references; bh=CLHKIKG3hHAjCkZGDoKRl5er4nims8GO1xNI5OW3jBU=; b=J1gwGDj4RWMHsAO8aePPUnPyw0ObmeFlAP6G8nYLbcrHcI6Iu3+Url4I3k0Sk8QUpvN3Gz TK3DO9LTbH9hxfsvCuvl5DHzFh46LZKDJ+XYrJAJF8lzMz0+B/ok/1grfYXzcMzeeHwzQx jzLPhBK4fSgtxCgvPS35S4ooJjgHknA= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 1/2] fw_cfg: Allow reboot-timeout=-1 again Date: Sun, 3 Nov 2019 23:25:10 +0100 Message-Id: <20191103222511.17478-2-philmd@redhat.com> In-Reply-To: <20191103222511.17478-1-philmd@redhat.com> References: <20191103222511.17478-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: jsTQzBuaNjK4ulIjNxu8zg-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.81 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laszlo Ersek , Gerd Hoffmann , "Dr. David Alan Gilbert" 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" From: "Dr. David Alan Gilbert" Commit ee5d0f89de3e53cdb0dc added range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot. Allow it again. Fixes: ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checki= ng") RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=3D1765443 Signed-off-by: Dr. David Alan Gilbert Message-Id: <20191025165706.177653-1-dgilbert@redhat.com> Suggested-by: Laszlo Ersek Message-Id: <37ac197c-f20e-dd05-ff6a-13a2171c7148@redhat.com> [PMD: Applied Laszlo's suggestions] Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvram/fw_cfg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index aef1727250..14f8437983 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -237,7 +237,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) static void fw_cfg_reboot(FWCfgState *s) { const char *reboot_timeout =3D NULL; - int64_t rt_val =3D -1; + uint64_t rt_val =3D -1; uint32_t rt_le32; =20 /* get user configuration */ @@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s) =20 if (reboot_timeout) { rt_val =3D qemu_opt_get_number(opts, "reboot-timeout", -1); + /* validate the input */ - if (rt_val < 0 || rt_val > 0xffff) { + if (rt_val > 0xffff && rt_val !=3D (uint64_t)-1) { error_report("reboot timeout is invalid," - "it should be a value between 0 and 65535"); + "it should be a value between -1 and 65535"); exit(1); } } --=20 2.21.0 From nobody Fri May 3 00:53:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1572820116; cv=none; d=zoho.com; s=zohoarc; b=oKViZKoEsXQUMG6dR3tD3NH2qzaSwESXHgZ+qO/s+ZRdkXrmLbvqHAJ8TbOfD2leQ9WlC2NJc1qwOjq+ji2u2cD1/5gHG2Sw1OFCVzaZM6RV4NUI6MnYMf+03YcEEfZyQ3Aw8aoOPQ26w5Ec4sl5UM3azUkBIYRbyYHcg23TNJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572820116; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AkafGVidG9zgHVqptL7Xr8/hhEFRnCpiTju5lPVbzBA=; b=FHMssoLz+1+Rwllc3zJ0z/JZrk+c8cjp1HS4wq7m/1cQcpPF+EQ84erdZNzvGJFdIDmgpw81qLpKLwIEsuNLHhF26MSOx7k45CVzxXrx+0rQuNC003SFR+1mf0DerE+3upOAop1x9WGc+jAqgsZ+P24ynk6+Qe+ZzjBt2mJLRi0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572820116621693.2088274678093; Sun, 3 Nov 2019 14:28:36 -0800 (PST) Received: from localhost ([::1]:56690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iROMN-0007ZH-Lh for importer@patchew.org; Sun, 03 Nov 2019 17:28:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iROJS-0004VB-G7 for qemu-devel@nongnu.org; Sun, 03 Nov 2019 17:25:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iROJQ-0002ZX-GT for qemu-devel@nongnu.org; Sun, 03 Nov 2019 17:25:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23275 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 1iROJQ-0002Yo-DK for qemu-devel@nongnu.org; Sun, 03 Nov 2019 17:25:32 -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-407-2diVFgdLPD6UXkzJtpl0fQ-1; Sun, 03 Nov 2019 17:25:30 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FC45477 for ; Sun, 3 Nov 2019 22:25:28 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-75.brq.redhat.com [10.40.204.75]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 57DD1600C1; Sun, 3 Nov 2019 22:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572819931; 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: in-reply-to:in-reply-to:references:references; bh=AkafGVidG9zgHVqptL7Xr8/hhEFRnCpiTju5lPVbzBA=; b=WgBnqetdtpMl9s/7pl2fIGApKR9Ba/yY9J4ufhCp9n3dZMcR0Ziv+9p+X2oPrZmLSesgD/ //qfs3PR3jJTB1zxkIr1/x4C4YI2VVjePsbbuI1oBZWr73g8YK+6TXY3fr17EQlXg2Eipe 8mUkysU6ALKMoH5Tc6ebxOH+A7eiih8= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 2/2] tests/fw_cfg: Test 'reboot-timeout=-1' special value Date: Sun, 3 Nov 2019 23:25:11 +0100 Message-Id: <20191103222511.17478-3-philmd@redhat.com> In-Reply-To: <20191103222511.17478-1-philmd@redhat.com> References: <20191103222511.17478-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 2diVFgdLPD6UXkzJtpl0fQ-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: Laurent Vivier , Thomas Huth , Laszlo Ersek , "Dr . David Alan Gilbert" , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" The special value -1 means "don't reboot" for QEMU/libvirt. Add a trivial test. Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/fw_cfg-test.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 1d3147f821..5dc807ba23 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -194,6 +194,26 @@ static void test_fw_cfg_reboot_timeout(void) qtest_quit(s); } =20 +static void test_fw_cfg_no_reboot_timeout(void) +{ + QFWCFG *fw_cfg; + QTestState *s; + uint32_t reboot_timeout =3D 0; + size_t filesize; + + /* Special value -1 means "don't reboot" */ + s =3D qtest_init("-boot reboot-timeout=3D-1"); + fw_cfg =3D pc_fw_cfg_init(s); + + filesize =3D qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", + &reboot_timeout, sizeof(reboot_timeout)); + g_assert_cmpint(filesize, =3D=3D, sizeof(reboot_timeout)); + reboot_timeout =3D le32_to_cpu(reboot_timeout); + g_assert_cmpint(reboot_timeout, =3D=3D, UINT32_MAX); + pc_fw_cfg_uninit(fw_cfg); + qtest_quit(s); +} + static void test_fw_cfg_splash_time(void) { QFWCFG *fw_cfg; @@ -233,6 +253,7 @@ int main(int argc, char **argv) qtest_add_func("fw_cfg/numa", test_fw_cfg_numa); qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu); qtest_add_func("fw_cfg/reboot_timeout", test_fw_cfg_reboot_timeout); + qtest_add_func("fw_cfg/no_reboot_timeout", test_fw_cfg_no_reboot_timeo= ut); qtest_add_func("fw_cfg/splash_time", test_fw_cfg_splash_time); =20 return g_test_run(); --=20 2.21.0