motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-08 16:07:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size

Browse source 
The 'boot_splash_filedata_size' was introduced as a global variable
in 3d3b8303c6. This variable is used as a 'size' argument to the
fw_cfg_add_file(). This function has an interface contract with its
'data' argument, but there is no such contract for 'size' (this is
not a referenced pointer).  We can simply remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20190308013222.12524-7-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2019-03-08 02:32:10 +01:00 • committed by Laurent Vivier
parent a8df4845a0
commit 96f209b946
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/nvram/fw_cfg.c
View file

@ -161,15 +161,14 @@ static void fw_cfg_bootsplash(FWCfgState *s)
} }
g_free(boot_splash_filedata); g_free(boot_splash_filedata);
boot_splash_filedata = (uint8_t *)file_data; boot_splash_filedata = (uint8_t *)file_data;
boot_splash_filedata_size = file_size;
/* insert data */ /* insert data */
if (file_type == JPG_FILE) { if (file_type == JPG_FILE) {
fw_cfg_add_file(s, "bootsplash.jpg", fw_cfg_add_file(s, "bootsplash.jpg",
boot_splash_filedata, boot_splash_filedata_size); boot_splash_filedata, file_size);
} else { } else {
fw_cfg_add_file(s, "bootsplash.bmp", fw_cfg_add_file(s, "bootsplash.bmp",
boot_splash_filedata, boot_splash_filedata_size); boot_splash_filedata, file_size);
} }
g_free(filename); g_free(filename);
} }

1
include/sysemu/sysemu.h
View file

@ -110,7 +110,6 @@ extern int old_param;
extern int boot_menu; extern int boot_menu;
extern bool boot_strict; extern bool boot_strict;
extern uint8_t *boot_splash_filedata; extern uint8_t *boot_splash_filedata;
extern size_t boot_splash_filedata_size;
extern bool enable_mlock; extern bool enable_mlock;
extern bool enable_cpu_pm; extern bool enable_cpu_pm;
extern QEMUClockType rtc_clock; extern QEMUClockType rtc_clock;

1
vl.c
View file

@ -185,7 +185,6 @@ const char *prom_envs[MAX_PROM_ENVS];
int boot_menu; int boot_menu;
bool boot_strict; bool boot_strict;
uint8_t *boot_splash_filedata; uint8_t *boot_splash_filedata;
size_t boot_splash_filedata_size;
bool wakeup_suspend_enabled; bool wakeup_suspend_enabled;
int icount_align_option; int icount_align_option;