From nobody Mon Feb 9 16:12:49 2026 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557095070; cv=none; d=zoho.com; s=zohoarc; b=a7E+wxmZ5kjHtNKEKiSZm0YPXX1iYLyAABjYnlRFnWcgcmKu6ef6BNsUGCg+w/pXOCdvnQe5xeDdONUhOMvKpt5wLGndElwzRt8rfBO1U2piwsBwrm5DXz4NHc7oq2vEeKT6vCvscBNK9ORi9N3mnTp1HAagwniSYhYWWGUG27o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557095070; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3CbNyz0PGA34ZvRc5zI/wvGQWVZ3AO6ea2hFUDq/m74=; b=ncf2cyF/JBOyzWeocc2be7zW9O7SPjXL+57bJxruDGmchEjBFAl0dJL1t9Dk7Zh3IaLuJIFq5/z4fnssJbK0yVMLqwHMPm10u5XfelZTsW7T8oVHrzuUa7Vl+0grxhPQvekbi5WsUeUKTv51597qYcPk8sWMqyJrPNMYZwWfBvM= ARC-Authentication-Results: i=1; mx.zoho.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557095070052906.3972633042717; Sun, 5 May 2019 15:24:30 -0700 (PDT) Received: from localhost ([127.0.0.1]:47010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNPYX-00022Y-Se for importer@patchew.org; Sun, 05 May 2019 18:24:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNPRA-0004XY-Hz for qemu-devel@nongnu.org; Sun, 05 May 2019 18:16:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNPR9-0000Gv-Jx for qemu-devel@nongnu.org; Sun, 05 May 2019 18:16:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNPR7-0000Bm-6T; Sun, 05 May 2019 18:16:45 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C3E43091740; Sun, 5 May 2019 22:16:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-58.brq.redhat.com [10.40.204.58]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7442F7C386; Sun, 5 May 2019 22:16:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Stephen Checkoway Date: Mon, 6 May 2019 00:15:41 +0200 Message-Id: <20190505221544.31568-11-philmd@redhat.com> In-Reply-To: <20190505221544.31568-1-philmd@redhat.com> References: <20190505221544.31568-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Sun, 05 May 2019 22:16:44 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 10/13] hw/block/pflash_cfi02: Extract the pflash_data_read() function 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: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Extract the code block in a new function, remove a goto statement. Signed-off-by: Stephen Checkoway Message-Id: <20190426162624.55977-3-stephen.checkoway@oberlin.edu> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [PMD: Extracted from bigger patch, remove the XXX tracing comment] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi02.c | 44 ++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 2777167af11..adfa39f9b5e 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -164,12 +164,33 @@ static void pflash_timer (void *opaque) pfl->cmd =3D 0; } =20 +/* + * Read data from flash. + */ +static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr offset, + unsigned int width) +{ + uint8_t *p =3D (uint8_t *)pfl->storage + offset; + uint64_t ret =3D pfl->be ? ldn_be_p(p, width) : ldn_le_p(p, width); + switch (width) { + case 1: + trace_pflash_data_read8(offset, ret); + break; + case 2: + trace_pflash_data_read16(offset, ret); + break; + case 4: + trace_pflash_data_read32(offset, ret); + break; + } + return ret; +} + static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, int width, int be) { hwaddr boff; uint32_t ret; - uint8_t *p; =20 ret =3D -1; trace_pflash_read(offset, pfl->cmd, width, pfl->wcycle); @@ -194,25 +215,8 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr o= ffset, case 0x80: /* We accept reads during second unlock sequence... */ case 0x00: - flash_read: /* Flash area read */ - p =3D (uint8_t *)pfl->storage + offset; - if (pfl->be) { - ret =3D ldn_be_p(p, width); - } else { - ret =3D ldn_le_p(p, width); - } - switch (width) { - case 1: - trace_pflash_data_read8(offset, ret); - break; - case 2: - trace_pflash_data_read16(offset, ret); - break; - case 4: - trace_pflash_data_read32(offset, ret); - break; - } + ret =3D pflash_data_read(pfl, offset, width); break; case 0x90: /* flash ID read */ @@ -232,7 +236,7 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr of= fset, } /* Fall through to data read. */ default: - goto flash_read; + ret =3D pflash_data_read(pfl, offset, width); } DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx32 "\n", __func__, boff,= ret); break; --=20 2.20.1