Commit 04da9735 authored by Li Qiang's avatar Li Qiang Committed by Philippe Mathieu-Daudé
Browse files

hw/nvram/fw_cfg: Store 'reboot-timeout' as little endian 



The current codebase is not specific about the endianess of the
fw_cfg 'file' entry 'reboot-timeout'.

Per docs/specs/fw_cfg.txt:

  === All Other Data Items ===

  Please consult the QEMU source for the most up-to-date
  and authoritative list of selector keys and their respective
  items' purpose, format and writeability.

Checking the git history, this code was introduced in commit
ac05f349, very similar to commit 3d3b8303 for the
'boot-menu-wait' entry, which explicitely use little-endian.

OVMF consumes 'boot-menu-wait' as little-endian, however it does
not consume 'reboot-timeout'.

Regarding the git history and OVMF use, we choose to explicit
'reboot-timeout' endianess as little-endian.

Signed-off-by: default avatarLi Qiang <liq3ea@163.com>
Tested-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190424140643.62457-4-liq3ea@163.com>
[PMD: Reword commit description based on review comments]
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent c99f5f1d

hw/nvram/fw_cfg.c

+3 −1
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static void fw_cfg_reboot(FWCfgState *s) 
{

    const char *reboot_timeout = NULL;

    int64_t rt_val = -1;

    uint32_t rt_le32;



    /* get user configuration */

    QemuOptsList *plist = qemu_find_opts("boot-opts");
@@ -250,7 +251,8 @@ static void fw_cfg_reboot(FWCfgState *s) 
        }

    }



    fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_val, 4), 4);

    rt_le32 = cpu_to_le32(rt_val);

    fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_le32, 4), 4);

}



static void fw_cfg_write(FWCfgState *s, uint8_t value)