Commit 19bcc4bc authored by Li Qiang's avatar Li Qiang Committed by Philippe Mathieu-Daudé
Browse files

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: default avatarLi Qiang <liq3ea@gmail.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe 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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent ee5d0f89

hw/nvram/fw_cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

include/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

vl.c

+0 −1
Original line number Diff line number Diff line
@@ -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;