mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/nvram/fw_cfg: Use the ldst API

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2019-03-09 19:19:20 +01:00 committed by Laurent Vivier
parent 945309260d
commit 3b777a79c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/nvram/fw_cfg.c
View File

@ -85,7 +85,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep,
} }
/* check magic ID */ /* check magic ID */
filehead = ((content[0] & 0xff) + (content[1] << 8)) & 0xffff; filehead = lduw_le_p(content);
if (filehead == 0xd8ff) { if (filehead == 0xd8ff) {
file_type = JPG_FILE; file_type = JPG_FILE;
} else if (filehead == 0x4d42) { } else if (filehead == 0x4d42) {
@ -96,7 +96,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep,
/* check BMP bpp */ /* check BMP bpp */
if (file_type == BMP_FILE) { if (file_type == BMP_FILE) {
bmp_bpp = (content[28] + (content[29] << 8)) & 0xffff; bmp_bpp = lduw_le_p(&content[28]);
if (bmp_bpp != 24) { if (bmp_bpp != 24) {
goto error; goto error;
} }