[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PULL 2/5] hw/nvram/fw_cfg: Remove the unnecessary boot_splas
From: |
Laurent Vivier |
Subject: |
[Qemu-arm] [PULL 2/5] hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size |
Date: |
Mon, 11 Mar 2019 20:11:25 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
The 'boot_splash_filedata_size' was introduced as a global variable
in 3d3b8303c6f. 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é <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/nvram/fw_cfg.c | 5 ++---
include/sysemu/sysemu.h | 1 -
vl.c | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 7fdf04adc97f..13aab122889d 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -161,15 +161,14 @@ static void fw_cfg_bootsplash(FWCfgState *s)
}
g_free(boot_splash_filedata);
boot_splash_filedata = (uint8_t *)file_data;
- boot_splash_filedata_size = file_size;
/* insert data */
if (file_type == JPG_FILE) {
fw_cfg_add_file(s, "bootsplash.jpg",
- boot_splash_filedata, boot_splash_filedata_size);
+ boot_splash_filedata, file_size);
} else {
fw_cfg_add_file(s, "bootsplash.bmp",
- boot_splash_filedata, boot_splash_filedata_size);
+ boot_splash_filedata, file_size);
}
g_free(filename);
}
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 89604a83282b..6065d9e4203a 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -110,7 +110,6 @@ extern int old_param;
extern int boot_menu;
extern bool boot_strict;
extern uint8_t *boot_splash_filedata;
-extern size_t boot_splash_filedata_size;
extern bool enable_mlock;
extern bool enable_cpu_pm;
extern QEMUClockType rtc_clock;
diff --git a/vl.c b/vl.c
index f46f8d769a5c..483ca17c6830 100644
--- a/vl.c
+++ b/vl.c
@@ -185,7 +185,6 @@ const char *prom_envs[MAX_PROM_ENVS];
int boot_menu;
bool boot_strict;
uint8_t *boot_splash_filedata;
-size_t boot_splash_filedata_size;
bool wakeup_suspend_enabled;
int icount_align_option;
--
2.20.1
- [Qemu-arm] [PULL 0/5] Trivial branch patches, Laurent Vivier, 2019/03/11
- [Qemu-arm] [PULL 1/5] thunk: improve readability of allocation loop, Laurent Vivier, 2019/03/11
- [Qemu-arm] [PULL 3/5] hw/i386: Remove unused include, Laurent Vivier, 2019/03/11
- [Qemu-arm] [PULL 5/5] hw/nvram/fw_cfg: Use the ldst API, Laurent Vivier, 2019/03/11
- [Qemu-arm] [PULL 2/5] hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size,
Laurent Vivier <=
- [Qemu-arm] [PULL 4/5] hw/arm/virt: Remove null-check in virt_build_smbios(), Laurent Vivier, 2019/03/11
- Re: [Qemu-arm] [PULL 0/5] Trivial branch patches, Peter Maydell, 2019/03/12