diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-03-09 19:19:20 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2019-03-11 18:48:20 +0100 |
| commit | 3b777a79c1cfa40f39f96220bc733eccd7392c9c (patch) | |
| tree | 713723c0430ac607d923db2cc5efd4e1b1e49824 /hw/nvram/fw_cfg.c | |
| parent | 945309260d79de0df98c47ca078447a76fd70ec6 (diff) | |
hw/nvram/fw_cfg: Use the ldst API
The load/store API eases code review.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190309181920.30553-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/nvram/fw_cfg.c')
| -rw-r--r-- | hw/nvram/fw_cfg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 13aab12288..5c3a46ce6f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -85,7 +85,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep, } /* check magic ID */ - filehead = ((content[0] & 0xff) + (content[1] << 8)) & 0xffff; + filehead = lduw_le_p(content); if (filehead == 0xd8ff) { file_type = JPG_FILE; } else if (filehead == 0x4d42) { @@ -96,7 +96,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep, /* check BMP bpp */ if (file_type == BMP_FILE) { - bmp_bpp = (content[28] + (content[29] << 8)) & 0xffff; + bmp_bpp = lduw_le_p(&content[28]); if (bmp_bpp != 24) { goto error; } |