Commit 412fbef3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging 



Fix the fw_cfg reboot-timeout=-1 special value, add a test for it.

# gpg: Signature made Sun 03 Nov 2019 22:21:02 GMT
# gpg:                using RSA key 89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (Phil) <philmd@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 89C1 E78F 601E E86C 8674  95CB A2A3 FD6E DEAD C0DE

* remotes/philmd-gitlab/tags/fw_cfg-next-pull-request:
  tests/fw_cfg: Test 'reboot-timeout=-1' special value
  fw_cfg: Allow reboot-timeout=-1 again

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 36609b4f eda4e62c

hw/nvram/fw_cfg.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

        }

    }

tests/fw_cfg-test.c

+21 −0
Original line number Diff line number Diff line
@@ -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();