[PATCH 0/2] fw_cfg: Allow reboot-timeout=-1 again

[PATCH 0/2] fw_cfg: Allow reboot-timeout=-1 again

[Philippe Mathieu-Daudé]

Fix the '-1' special value, and add a test.

Dr. David Alan Gilbert (1):
  fw_cfg: Allow reboot-timeout=-1 again

Philippe Mathieu-Daudé (1):
  tests/fw_cfg: Test 'reboot-timeout=-1' special value

 hw/nvram/fw_cfg.c   |  7 ++++---
 tests/fw_cfg-test.c | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

-- 
2.21.0

[PATCH 1/2] fw_cfg: Allow reboot-timeout=-1 again

[Philippe Mathieu-Daudé]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

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 checking")
RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20191025165706.177653-1-dgilbert@redhat.com>
Suggested-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <37ac197c-f20e-dd05-ff6a-13a2171c7148@redhat.com>
[PMD: Applied Laszlo's suggestions]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 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 = NULL;
-    int64_t rt_val = -1;
+    uint64_t rt_val = -1;
     uint32_t rt_le32;
 
     /* get user configuration */
@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)
 
     if (reboot_timeout) {
         rt_val = qemu_opt_get_number(opts, "reboot-timeout", -1);
+
         /* validate the input */
-        if (rt_val < 0 || rt_val > 0xffff) {
+        if (rt_val > 0xffff && rt_val != (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);
         }
     }
-- 
2.21.0

[PATCH 2/2] tests/fw_cfg: Test 'reboot-timeout=-1' special value

[Philippe Mathieu-Daudé]

The special value -1 means "don't reboot" for QEMU/libvirt.
Add a trivial test.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 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);
 }
 
+static void test_fw_cfg_no_reboot_timeout(void)
+{
+    QFWCFG *fw_cfg;
+    QTestState *s;
+    uint32_t reboot_timeout = 0;
+    size_t filesize;
+
+    /* Special value -1 means "don't reboot" */
+    s = qtest_init("-boot reboot-timeout=-1");
+    fw_cfg = pc_fw_cfg_init(s);
+
+    filesize = qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait",
+                                &reboot_timeout, sizeof(reboot_timeout));
+    g_assert_cmpint(filesize, ==, sizeof(reboot_timeout));
+    reboot_timeout = le32_to_cpu(reboot_timeout);
+    g_assert_cmpint(reboot_timeout, ==, 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_timeout);
     qtest_add_func("fw_cfg/splash_time", test_fw_cfg_splash_time);
 
     return g_test_run();
-- 
2.21.0

Re: [PATCH 2/2] tests/fw_cfg: Test 'reboot-timeout=-1' special value

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> The special value -1 means "don't reboot" for QEMU/libvirt.
> Add a trivial test.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  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);
>  }
>  
> +static void test_fw_cfg_no_reboot_timeout(void)
> +{
> +    QFWCFG *fw_cfg;
> +    QTestState *s;
> +    uint32_t reboot_timeout = 0;
> +    size_t filesize;
> +
> +    /* Special value -1 means "don't reboot" */
> +    s = qtest_init("-boot reboot-timeout=-1");
> +    fw_cfg = pc_fw_cfg_init(s);
> +
> +    filesize = qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait",
> +                                &reboot_timeout, sizeof(reboot_timeout));
> +    g_assert_cmpint(filesize, ==, sizeof(reboot_timeout));
> +    reboot_timeout = le32_to_cpu(reboot_timeout);
> +    g_assert_cmpint(reboot_timeout, ==, 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_timeout);
>      qtest_add_func("fw_cfg/splash_time", test_fw_cfg_splash_time);
>  
>      return g_test_run();
> -- 
> 2.21.0
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH 0/2] fw_cfg: Allow reboot-timeout=-1 again

[Laszlo Ersek]

On 10/29/19 18:01, Philippe Mathieu-Daudé wrote:
> Fix the '-1' special value, and add a test.
> 
> Dr. David Alan Gilbert (1):
>   fw_cfg: Allow reboot-timeout=-1 again
> 
> Philippe Mathieu-Daudé (1):
>   tests/fw_cfg: Test 'reboot-timeout=-1' special value
> 
>  hw/nvram/fw_cfg.c   |  7 ++++---
>  tests/fw_cfg-test.c | 21 +++++++++++++++++++++
>  2 files changed, 25 insertions(+), 3 deletions(-)
> 

series
Reviewed-by: Laszlo Ersek <lersek@redhat.com>