aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Qiang <liq3ea@gmail.com>2018-11-20 21:10:26 -0800
committerPhilippe Mathieu-Daudé <philmd@redhat.com>2019-01-04 15:30:52 +0100
commit19bcc4bc3213e78c303ad480a7a578f62258252d (patch)
tree6fe351bfb78c2c94e3f53e42a1272db78d23c4c6
parentee5d0f89de3e53cdb0dcf51acc1502b310ed3bd2 (diff)
downloadqemu-arm-19bcc4bc3213e78c303ad480a7a578f62258252d.tar.gz
fw_cfg: Make qemu_extra_params_fw locally
qemu_extra_params_fw[] has external linkage, but is used only in fw_cfg_bootsplash(), it makes sense to make it locally. Signed-off-by: Li Qiang <liq3ea@gmail.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <1542777026-2788-4-git-send-email-liq3ea@gmail.com> [PMD: Removed qemu_extra_params_fw declaration in vl.c] Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-rw-r--r--hw/nvram/fw_cfg.c1
-rw-r--r--include/sysemu/sysemu.h1
-rw-r--r--vl.c1
3 files changed, 1 insertions, 2 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index cba58344f5..de58c7be46 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -119,6 +119,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 e0d15da937..85877b7e43 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -116,7 +116,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;
diff --git a/vl.c b/vl.c
index efa4ff9da5..0db5ad0246 100644
--- a/vl.c
+++ b/vl.c
@@ -191,7 +191,6 @@ int boot_menu;
bool boot_strict;
uint8_t *boot_splash_filedata;
size_t boot_splash_filedata_size;
-uint8_t qemu_extra_params_fw[2];
bool wakeup_suspend_enabled;
int icount_align_option;