From patchwork Mon Mar 11 19:11:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1054818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44J7Bz1sxLz9s55 for ; Tue, 12 Mar 2019 06:16:59 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QPx-0000Ut-5p for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2019 15:16:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QL6-0005PE-VN for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3QL6-0003Xz-2d for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:56 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:52801) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3QL3-0003Tv-JY; Mon, 11 Mar 2019 15:11:53 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQMmF-1hPkXw1L8L-00MI6j; Mon, 11 Mar 2019 20:11:37 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 20:11:25 +0100 Message-Id: <20190311191128.30562-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190311191128.30562-1-laurent@vivier.eu> References: <20190311191128.30562-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:HFlQa10MD656FZ3YLA7NbZ2FXpyv7sOUhCkLAYKUokk0HWhpMGn 5tpeCV1NOhjJEFzoaFuV/uFB40NlrAi8piP8FPwxvWX9xf/02t9MKAzU1ojjrKOwkgLonbT 89gQgJ7EuC2f5f3tQy0IreDvFK42RZ2JnhEDekou+Xce1xUmmM8fEjPW2RlurA7qa2iytN6 wsUx1lrluhyhUVNUQ5AvQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:yAvhZuhBY7E=:dMA1BqMbq4omhSgggHCYob V1Io0AJjQXvYZe9iZB2UFBuQRXI/vM9v4wN5y4Q7bA170jXVyTh3e8xFSj+PYFyQTT3eChNRp KizvYNRu7YVnhHXr57rCH77kPEpyVySAH/ZPlT0if1rOiiUfJdJ89d18b36vTkGBbIpBlIop2 pU5X/xoqMOWQG1EPmC+Cuh1Lr6ZK1xilATn71grzIsCA1gQt1FvgTDqd7bYwYlhP5Tn4foroF RmMwMdA+vTgod5SVIdRJQaiqrp2zWrrm8UAbiP/OEldlNjcyPjRcwGxU8a7jk2B1ypHvGVC4P YGEJUb5D2IPNZdUBRfakp/NdpzVipTdoQVqkdsvxxFanrGInfYilPk0yDh2xvcwjcXcx3gzQh MbWNZLQficwqkWUCDtUInlmS53WMWi3U83iBQeDy3fSOhCdfNvIPiUFTTTaB4W9twuctkdhkO GQr70ZepOoyMPZhC+cUcAieIHBve9KSzIZCG/kMPxsXweqlztMASvB45GQpr8O7/poEAdpGLd 5QVbmsA8FmMF9n5FKeFnUOE9ka/AZlRdSlfG88ibU9nejwUmd7lmqp1vzRkLaUm27/l2U+uaS RxvNH39beo3OUOAufJQZGj0o2Qvbw3mjMY1OEDZP74KnbAzP7ftkvielNkd1bfPW2ccbpRH0a qE2sWR1UPTUjBqydlY21S7q3G0ukulFFULw2i7WDLKbIkjWXYKJLNE+0vovRjGyN8tC39zBIM Bp7t/KxIFENQ8NsJnA6DhXqit1AjH0A2IFti4JIWCylZYldcM3xlXn8w5k0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 2/5] hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Riku Voipio , Michael Tokarev , Laurent Vivier , qemu-arm@nongnu.org, Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Laszlo Ersek Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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 its 'data' argument, but there is no such contract for 'size' (this is not a referenced pointer). We can simply remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Laszlo Ersek Message-Id: <20190308013222.12524-7-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/nvram/fw_cfg.c | 5 ++--- include/sysemu/sysemu.h | 1 - vl.c | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 7fdf04adc97f..13aab122889d 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -161,15 +161,14 @@ static void fw_cfg_bootsplash(FWCfgState *s) } g_free(boot_splash_filedata); boot_splash_filedata = (uint8_t *)file_data; - boot_splash_filedata_size = file_size; /* insert data */ if (file_type == 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 89604a83282b..6065d9e4203a 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 f46f8d769a5c..483ca17c6830 100644 --- a/vl.c +++ b/vl.c @@ -185,7 +185,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; int icount_align_option;