From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:35687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h29KX-0006SX-4G for qemu-devel@nongnu.org; Fri, 08 Mar 2019 01:50:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h29KW-0000AW-6s for qemu-devel@nongnu.org; Fri, 08 Mar 2019 01:50:05 -0500 References: <20190308013222.12524-1-philmd@redhat.com> <20190308013222.12524-7-philmd@redhat.com> From: Thomas Huth Message-ID: <37ef3c6b-e99e-859e-2324-9c59ff6bc1f8@redhat.com> Date: Fri, 8 Mar 2019 07:49:48 +0100 MIME-Version: 1.0 In-Reply-To: <20190308013222.12524-7-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 06/18] hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Laszlo Ersek , Gerd Hoffmann , "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , Richard Henderson , Artyom Tarasenko , "Dr. David Alan Gilbert" , QEMU Trivial , Igor Mammedov , Eric Blake , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, Markus Armbruster , Mark Cave-Ayland , "Daniel P . Berrange" On 08/03/2019 02.32, Philippe Mathieu-Daud=C3=A9 wrote: > 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 his > 'data' argument, but there is no such contract for 'size' (this is > not a referenced pointer). We can simply remove it. >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > hw/nvram/fw_cfg.c | 5 ++--- > include/sysemu/sysemu.h | 1 - > vl.c | 1 - > 3 files changed, 2 insertions(+), 5 deletions(-) >=20 > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 8eb76a382c..b2dc0a80cb 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -217,15 +217,14 @@ static void fw_cfg_bootsplash(FWCfgState *s) > } > g_free(boot_splash_filedata); > boot_splash_filedata =3D (uint8_t *)file_data; > - boot_splash_filedata_size =3D file_size; > =20 > /* insert data */ > if (file_type =3D=3D 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 89604a8328..6065d9e420 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 4c5cc0d8ad..fad6fec38c 100644 > --- a/vl.c > +++ b/vl.c > @@ -188,7 +188,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; > =20 > int icount_align_option; >=20 Nice, one global variable less! Reviewed-by: Thomas Huth