[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 3/3] fw_cfg: make qemu_extra_params_fw locall
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v2 3/3] fw_cfg: make qemu_extra_params_fw locally |
Date: |
Tue, 11 Dec 2018 17:18:20 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.1 |
Hi Li,
On 11/21/18 6:10 AM, Li Qiang wrote:
> 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 <address@hidden>
> Reviewed-by: Markus Armbruster <address@hidden>
> ---
> hw/nvram/fw_cfg.c | 1 +
> include/sysemu/sysemu.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index aafa96721f..a71f043b5d 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;
>
You forgot to remove it from vl.c:
$ git grep qemu_extra_params_fw
vl.c:194:uint8_t qemu_extra_params_fw[2];
I'll simply squash this in your patch when applying:
-- >8 --
--- 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];
int icount_align_option;
---
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v2 3/3] fw_cfg: make qemu_extra_params_fw locally,
Philippe Mathieu-Daudé <=