| Message ID | 20181119154737.9840-4-liq3ea@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | fw_cfg: fix boot bootsplash and reboot-timeout error checking | expand |
Li Qiang <liq3ea@163.com> writes: > qemu_extra_params_fw[] has external linkage, but is used > only in fw_cfg_bootsplash(), it makes sense to make it > locally. > > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Li Qiang <liq3ea@163.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0489d63a1b..4eddd6a885 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -120,6 +120,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) { const char *boot_splash_filename = NULL; const char *boot_splash_time = NULL; + uint8_t qemu_extra_params_fw[2]; char *filename, *file_data; gsize file_size; int file_type; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 8d6095d98b..f8608d24d9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -133,7 +133,6 @@ extern uint8_t *boot_splash_filedata; extern size_t boot_splash_filedata_size; extern bool enable_mlock; extern bool enable_cpu_pm; -extern uint8_t qemu_extra_params_fw[2]; extern QEMUClockType rtc_clock; extern const char *mem_path; extern int mem_prealloc;
qemu_extra_params_fw[] has external linkage, but is used only in fw_cfg_bootsplash(), it makes sense to make it locally. Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Li Qiang <liq3ea@163.com> --- hw/nvram/fw_cfg.c | 1 + include/sysemu/sysemu.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)