From patchwork Mon Mar 11 19:11:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1054819 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 44J7F66w8qz9s55 for ; Tue, 12 Mar 2019 06:18:50 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QRk-0001r0-1y for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2019 15:18:48 -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 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_Mathieu?= =?utf-8?q?-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 load/store API eases code review. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé 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, } /* check magic ID */ - filehead = ((content[0] & 0xff) + (content[1] << 8)) & 0xffff; + filehead = lduw_le_p(content); if (filehead == 0xd8ff) { file_type = JPG_FILE; } else if (filehead == 0x4d42) { @@ -96,7 +96,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep, /* check BMP bpp */ if (file_type == BMP_FILE) { - bmp_bpp = (content[28] + (content[29] << 8)) & 0xffff; + bmp_bpp = lduw_le_p(&content[28]); if (bmp_bpp != 24) { goto error; }