From nobody Sun Apr 28 23:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552331629915174.20640126398314; Mon, 11 Mar 2019 12:13:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:38830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QMs-0006X4-I6 for importer@patchew.org; Mon, 11 Mar 2019 15:13:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QL0-0005Ht-HB for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3QKz-0003R3-Pj for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:50 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:35901) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3QKz-0003PA-Eh; Mon, 11 Mar 2019 15:11:49 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MV6G0-1hSCyc0iqU-00S5WQ; Mon, 11 Mar 2019 20:11:36 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 20:11:24 +0100 Message-Id: <20190311191128.30562-2-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 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:V3rV00znpLrw2EPDqF8QZ1krrSFLot7j6A2eDzXgF0rILoCbU+U XZ7i9XUUoLPB8A64OD4YwS2bllQxHDP/gom8khwhau+FDP+eXbbnIgFD2OJdn9k7Qm/WoI+ +v/LK0pmToMzEbs74NYHQmRV48DN9GN9ftu5m5Xz5omHtthS1U+8k0zZe7QmqUu3kTDgxr0 OlF2lK5fsyS1nn+Zv5hIw== X-UI-Out-Filterresults: notjunk:1;V03:K0:keO88pR/iVE=:HKErR4ObzhAp0fky+vXTD/ e+Ob1NGKRRpEYDweZvzmr4341GRfTXb9KWeK8j259ae92cVrvPW9tGSbHjcrvqfK+FhQB5sND QN7pEvZDXTj3mDvvYiL+7Xn6fnBrimwBJMQFPGZpAfV7gzpUWvYAjI2qIyUJyZR99+PFk02G4 B99K/bK34XH0qnoL7G3Ubo+xy45CSR+lmurO5Sz+wGqE6mMYDK11iTrTUCGfQJCMsh7vunUjD 3D2JEKJZGAnbnvkDsqtyrbkQfGkTcTdFXXJYVDXWtiiAguKMNLwu9z677+lPithZKsN786VNG ZuE6ZcH/7IL6f6N05zpCz2xr/jsJQUzTtv8QsRz4bSKl3mC0//TIFAAsBNeSdA4Bd4PFhXatE 3vxT+Up5mT/eheFc53Qm+x9R+dMsCRlsThP0kLcH46CWVbrdldgb5r6BrXpVM7GGqk4lzMd7T iWg7iKoj9wn3V67UGrmvAVYZr/wllU3kJz2sYm2mrlSzeynIH9K0sP2xYlUg/oG1iO8n/Cz+M ZligjUQ/UusyoLHOpWAFicyEwEhlg/8n3sOouerifnqknV6cL9/VVoFPO4th1fukCspFhs/Ow H6HC+FQMVeTwCM+QNLzlIdgmh6A+wns4pw/epyUOVZXrdCwyUNx2UsA+S3y3ReLx+HOEhYO0i e+t3TAghcLfvCKoQ3HClg+GI51hLxIMcU7lE1OwVrstEJIWHCkPe2m2VZToeXMV4kqOj41D16 Na+VyLWth8eAGiE2GSyCC7PUuQe60/1mmnykHQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 1/5] thunk: improve readability of allocation loop 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 , Stefan Hajnoczi , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Riku Voipio , Michael Tokarev , Laurent Vivier , qemu-arm@nongnu.org, Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Laszlo Ersek , Aarushi Mehta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aarushi Mehta Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi Message-Id: Signed-off-by: Laurent Vivier --- thunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thunk.c b/thunk.c index 17f3d320bb8e..7f31cffe0968 100644 --- a/thunk.c +++ b/thunk.c @@ -86,7 +86,7 @@ void thunk_register_struct(int id, const char *name, cons= t argtype *types) #endif /* now we can alloc the data */ =20 - for(i =3D 0;i < 2; i++) { + for (i =3D 0; i < ARRAY_SIZE(se->field_offsets); i++) { offset =3D 0; max_align =3D 1; se->field_offsets[i] =3D g_new(int, nb_fields); --=20 2.20.1 From nobody Sun Apr 28 23:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552331875834865.8037253090141; Mon, 11 Mar 2019 12:17:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:38911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QQk-0001J7-S0 for importer@patchew.org; Mon, 11 Mar 2019 15:17:46 -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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Mathieu-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 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 =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 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; =20 int icount_align_option; --=20 2.20.1 From nobody Sun Apr 28 23:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15523316310851004.5653938937066; Mon, 11 Mar 2019 12:13:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:38832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QMt-0006Xx-Tt for importer@patchew.org; Mon, 11 Mar 2019 15:13:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QL5-0005NN-CH for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3QL4-0003W6-L9 for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:55 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:49325) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3QL2-0003SY-Ix; Mon, 11 Mar 2019 15:11:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mgek6-1gZaEQ1tJk-00h8LM; Mon, 11 Mar 2019 20:11:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 20:11:26 +0100 Message-Id: <20190311191128.30562-4-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:+/7vQYnWzSBZpyc21fQiaX1NhoLlLObmbxfRYYgeqZRGWk36tgV uqMOEowoEasOPODlDJiBTw+tR6WUCf+fyZXmNlY9e5oyUKe22dyBK4OLZhzn3Zo4KZQfOlk +fdtjIaWkjTrpvIISRhXJevtyrK33at/n6TB91gCQp3FayzXxtG4q49X1y9O9bKkvqKx1Yt Vp3llgE7QHshWl8f+1cLw== X-UI-Out-Filterresults: notjunk:1;V03:K0:RNrBHDC5rY8=:St7pIStrAkgi2QCwDbggJT qYwJYS+FveRoBPtFRZb3coEVATExAKb3A9MCbMSXTRq3au8uoROztW7Q0Z7UY8U5XP95VaLxR woQ86ZqWbDnH3f8lvL45AVpDuCNWnUuUlrlzKNs9hT182XwKuFFCRqWOIn6f7Agi72/8VCN8v /fQkWesBktCIkN1I3iBKzalYTCiF791yfpIaLxfFl6eyyEaRG0+JUMvtUtOKokpwudEqTgv+a znDIz79DmvbunB8RNuG1sHiO9FbMxL5UsD3MJgRFruA54df+/35HJo/UUW+UaIL2BhGFP/hl7 qSCo++ALCP2f0GifbS9hlMxTdoVrRvi/XDrNk6LJLYTou8uSoD+SzGuWttnmOusG8IB9jfqUE XOalJQIFqzUKK6wNu3jwIJpogQZ0TWQcBocK1VTT7P3znJtqGVLF74mV5UP6KFofsmhI27EhB n2yb4ZG1cS0UBSBEc2bdqEKNy8eNDg1Lz27lpUNfL8vgqqaoUVp7IR2boGjrpLrGFaxoaK9yL fc18OeCgqYIhKbl7OgLLGoHAYbfTgCIpuadcrLV8+GD4ZiReO2C+ZTB+D2Z2fuwWHgccT5gnK xqKZXufG5FzapSKRRxBEYzcTsdkSRlxTNOwIA4jF3kxZKVKKOfqN/8OZ8Ij56fwSS2N1QCKGa 5Iz83ZLspo6UPruZ+tqsmZeB4AbWRJULSjwpjfRZGjp/txF2g/Ue4yzzmfAtGLUsLv8IBsYUl vlxrExVSx+PT0rL+ZHZNLRwhOcOezQll1GElg+qQaXZTD69wpI5vhXeisIY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 3/5] hw/i386: Remove unused include 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=20Mathieu-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laszlo Ersek Reviewed-by: Thomas Huth Message-Id: <20190308013222.12524-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/acpi/piix4.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 8fd25a59269a..7b98121070f6 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -28,7 +28,6 @@ #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/range.h" -#include "hw/nvram/fw_cfg.h" #include "exec/address-spaces.h" #include "hw/acpi/piix4.h" #include "hw/acpi/pcihp.h" --=20 2.20.1 From nobody Sun Apr 28 23:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552331775258818.5311946537619; Mon, 11 Mar 2019 12:16:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:38899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QPA-00008w-4B for importer@patchew.org; Mon, 11 Mar 2019 15:16:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QL8-0005Rc-UN for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:12:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3QL8-0003aJ-Al for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:58 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:46901) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3QL4-0003Uo-Du; Mon, 11 Mar 2019 15:11:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkYkC-1gdPhl2LxW-00m6PW; Mon, 11 Mar 2019 20:11:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 20:11:27 +0100 Message-Id: <20190311191128.30562-5-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ixxF0H+MoBCgnQiepnZhCOBCG3pviUjJCeH8j2JQGbKgx2eaGVl FfZZ2KOYE8VVbH8sg+C+7FX8I2yC3up0z/7IHObzUu2Mh8DAycUe5luCSvcSG4+Z8BBXdxI 4HRxvo+cZNwO87v0ztJAsXSKUZxKPbcIjEK6Sen3N4R3QSGfBrZ3+P9F8b2KfULVZoZDdY3 kaBt4sem+ldeMER1yac5w== X-UI-Out-Filterresults: notjunk:1;V03:K0:0mxlzMy3Pso=:LOy2L9wK+lq+U1aevPq0II N8rQyYujvQaOioGRaU35FCGPRpIPhkyaVwWJbvDfNb6QbQzsUjwxNhFb+hSby68y/gthN2ObO TskrqDDJupodKDhfCbMwcznFmpa88ecjL5WdFdKsdFUTkchIUQCuwtUNQzP02gA9UY0jlyuzB DF4uBnw/DUM8vknjm3T1sphTeGVHDfXu27o5Xca1gDRgolEhwkYp3PIIUlf37f4Uu29Txzvhk 3ADvMnvuIneTvLSsqTPTa+oRziJbqLZoYEJ7smP3n5x5V/nALydo8kntrStcauTlYuzZTqMuC T5R2X3p3bByV1mMv2mKao2MIm1Kuv9jjqsNcrcvQEvy8x5f0zqOvGPkQnT33MXxmlytSgjPC+ 9LtdL/Jr/wW9Knb6UZdxP53Sp/1Fdl4AkappQnENYP08h8Nt2EMjr4PYHsDUSXUOwM5+ugm07 +g6btYWQRgwxbRFKLcCF29kgAgx8/CTddnVuTo+mLoeXPwk4/sGDSh6rBN4KDulZ0Ljgzrlm+ fdrhY4/c4sXUAAj8G/ibjggCT8STomOpYZewczOaIizUfXN0b5MjOeFpL7+YmWyKNy/IBHCiO 6JucCkdfaeTkvUs59J9xmEVOI87k2M+dd12uHuhYAGicm6abOAD8Pz4uDgDtHOqtsgMqwzJVQ MosRjL9TyMSuxXZEjlEOqcUHopuO0+bNSmryX+dZC+hEE184ZCUifhpIL72qmJlXQJs1CY4vE osHY/1YYIffyo7RGl1gTMTvHERR149VKOyKz31R30+DED0KYHXUEZUG9Y8k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 4/5] hw/arm/virt: Remove null-check in virt_build_smbios() 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 , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Riku Voipio , Michael Tokarev , Laurent Vivier , Markus Armbruster , qemu-arm@nongnu.org, Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Since commit 578f3c7b0835 ("arm: add fw_cfg to "virt" board", 2014-12-22), the machvirt_init() unconditionally creates the fw_cfg object. Later, commit c30e15658b1b ("smbios: implement smbios support for mach-virt", 2015-09-07) added a superfluous null-check on it. Remove this superfluous check. Reviewed-by: Laszlo Ersek Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190309181920.30553-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/arm/virt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7f66ddad89f6..377e95a4cdb0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1281,10 +1281,6 @@ static void virt_build_smbios(VirtMachineState *vms) size_t smbios_tables_len, smbios_anchor_len; const char *product =3D "QEMU Virtual Machine"; =20 - if (!vms->fw_cfg) { - return; - } - if (kvm_enabled()) { product =3D "KVM Virtual Machine"; } --=20 2.20.1 From nobody Sun Apr 28 23:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552331963398293.632805120827; Mon, 11 Mar 2019 12:19:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:38931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QSD-00029b-89 for importer@patchew.org; Mon, 11 Mar 2019 15:19:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QL7-0005Ps-KV for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3QL6-0003Yg-Rl for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:57 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:35411) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3QL4-0003VY-PP; Mon, 11 Mar 2019 15:11:55 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mk0FS-1gf3rg2hGi-00kRiS; Mon, 11 Mar 2019 20:11:40 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 20:11:28 +0100 Message-Id: <20190311191128.30562-6-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:O3d1O9PL+YJpFY83VOHpBzFgNXCjBqdqt5u3eRlfFznZeVE4Mlj oDJK6z3/pDMNuDsD+XYt2iCmUtD74mO5x3QW1vnY2aE8QZgDVPMcbHIqpUYYXWnjz7Sro3j 6ZVm7Jq75cNNMdVY4dQwmSRUolGai6eeMg44TUhUDyvgOZVDxkysynOH9iXWtyA2Tf9pYjU dz4Re0AjxR7R4lR3m0XFA== X-UI-Out-Filterresults: notjunk:1;V03:K0:5O++kXf8Qqo=:y2vymZd5uMYCXpFpD4lpnS DVp24k4XUpqgwNrfiUl8aX72EIKjvsVTDe84jVPp1Ks2V7ffOXwDi7S/6Zs5ooNseQ54pqwfQ eyKV/yyHnVsahhdo6FWvpqw1bMNq4BWha/5wEnC8bfOG0ZHu5jn+91vMOJTKtOMaXemY21AxH CtnOiuz+H8amg2BgN18BpdpANFzmu39Q+l5XVSP7WYjPcq/1rWGa0LdJGEDQ+HMoI+lomxfzV 673qH4C5ANUzx/b64hNtXJsewOxPJ1V7ELUKrWTP/niCnNKjl/9/yy61zd/u9FbRgm4qqtw7o vwFALaxaYtiPXsyGK5VbM338xRnZ97rtKhapRDCGiirYQrbM+MBCAduQB8BDkIB2TMiVo8GHb PCSEcydy9NBSiGqP+Bkf698d6ZRHQwy7ZJpl7JVU3d4HE0rMAMjHThsFECkM4N/9xifbdYhmx gAp6itDjtdsHodXiF9MMK91+Xmjorx3GXFBzSF/k8ZLEpcUZKepbz0Q8Oaqk+2LuLQdEV5XZ2 Hs+rzMJD+4QhwiCeKd+uQNJSmE364CRITKATAC066+B7opTHtINr3ZSztCxwz8fcB4yjPirL5 9fI8afEJXrHYYLZIFu75IbWVpMr5HRC7ep9KyDJgtlBck+MoM/G2ysnQKrrIX83xl+tDn6yBK F1sQDUC47hloQRcnOJZhQQeQpkq9qkIxHYDNMGHz1+O9qTiimaTr0eGek70V2+GPGXAWT5z0y V6/bxdwQPRaXJB00Vsw0ZxAwu4Fc9BzHeOxS/zgNvasbx2Lka1xGTLeuDvY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 5/5] hw/nvram/fw_cfg: Use the ldst API 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 , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 The load/store API eases code review. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190309181920.30553-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/nvram/fw_cfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 13aab122889d..5c3a46ce6f2a 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -85,7 +85,7 @@ static char *read_splashfile(char *filename, gsize *file_= sizep, } =20 /* check magic ID */ - filehead =3D ((content[0] & 0xff) + (content[1] << 8)) & 0xffff; + filehead =3D lduw_le_p(content); if (filehead =3D=3D 0xd8ff) { file_type =3D JPG_FILE; } else if (filehead =3D=3D 0x4d42) { @@ -96,7 +96,7 @@ static char *read_splashfile(char *filename, gsize *file_= sizep, =20 /* check BMP bpp */ if (file_type =3D=3D BMP_FILE) { - bmp_bpp =3D (content[28] + (content[29] << 8)) & 0xffff; + bmp_bpp =3D lduw_le_p(&content[28]); if (bmp_bpp !=3D 24) { goto error; } --=20 2.20.1