From nobody Mon Feb 9 17:05:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1595568285; cv=none; d=zohomail.com; s=zohoarc; b=TaoiyRHXBNG0Im09KowlkHYpB3R9aP4J3VrepIne5VybsXip6WeelXntn1mTUKw4vXwBVh4oKCs7lTCbf8WVjEfjkYaeWMF7xqtcSFmDg7xFxehzNz1m30fhKrt6yGboTcA/cscBRii/cI5i8Pe0R/wjM5Dq9LLfH6FtQQ+CU9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595568285; 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; bh=1PIIZ0rWR7fbA3h+dJxS8bPAnBQjFmR4OXt+O8WSIe4=; b=bRWJVBTNnCPeITB6BcJ4/wkeXee+4DxLB4CU+tpEyenSVSZTQRIj8Li58lSc57SXffnN0M6dWBXVKxDKpNFuwEESJUpN2imv3JWh5FLTAWCoYUF7r0d4I2/du4q8eRqR4YIMqbsOK/ExFsNiLixSZpi5lCpm5zF9jk28ngF/gYc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1595568285783396.70107936959766; Thu, 23 Jul 2020 22:24:45 -0700 (PDT) Received: from localhost ([::1]:46124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyqCK-0003Df-H5 for importer@patchew.org; Fri, 24 Jul 2020 01:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyqAr-000114-CV for qemu-devel@nongnu.org; Fri, 24 Jul 2020 01:23:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:58658 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyqAn-0007Ro-99 for qemu-devel@nongnu.org; Fri, 24 Jul 2020 01:23:13 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-8ZudlPRyPCafl_ZxXyD4gQ-1; Fri, 24 Jul 2020 01:23:06 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D4B980183C; Fri, 24 Jul 2020 05:23:05 +0000 (UTC) Received: from ibm-p8-OVS-01-fsp.mgmt.pnr.lab.eng.rdu2.redhat.com (ovpn-120-206.rdu2.redhat.com [10.10.120.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 816B17F4D6; Fri, 24 Jul 2020 05:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595568188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1PIIZ0rWR7fbA3h+dJxS8bPAnBQjFmR4OXt+O8WSIe4=; b=cPxTE+vnoOwmG0gdVqFKQTC6ZGm0JhvNqe4jyK194FKbrJWLgnMLwfWx/kV2/1KNCotrly 3v4IqlCK+8IIN3cW2/CTYn0lT9muEFU3SJ9/+2jzFBMLXSfcTp3MnX8Q/eVbrT61izhMf/ 9KfM808qjvSy599Hu3j2Bu5hgISm0uY= X-MC-Unique: 8ZudlPRyPCafl_ZxXyD4gQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 4/7] ide: reorder set/get sector functions Date: Fri, 24 Jul 2020 01:22:57 -0400 Message-Id: <20200724052300.1163728-5-jsnow@redhat.com> In-Reply-To: <20200724052300.1163728-1-jsnow@redhat.com> References: <20200724052300.1163728-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 00:00:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Alexander Bulekov , John Snow , qemu-block@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reorder these just a pinch to make them more obvious at a glance what the addressing mode is. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/core.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index a880b91b47..f35864070b 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -587,21 +587,23 @@ int64_t ide_get_sector(IDEState *s) { int64_t sector_num; if (s->select & 0x40) { - /* lba */ - if (!s->lba48) { - sector_num =3D ((s->select & 0x0f) << 24) | (s->hcyl << 16) | - (s->lcyl << 8) | s->sector; - } else { + if (s->lba48) { sector_num =3D ((int64_t)s->hob_hcyl << 40) | ((int64_t) s->hob_lcyl << 32) | ((int64_t) s->hob_sector << 24) | ((int64_t) s->hcyl << 16) | ((int64_t) s->lcyl << 8) | s->sector; + } else { + /* LBA28 */ + sector_num =3D ((s->select & 0x0f) << 24) | (s->hcyl << 16) | + (s->lcyl << 8) | s->sector; } } else { + /* CHS */ sector_num =3D ((s->hcyl << 8) | s->lcyl) * s->heads * s->sectors + (s->select & 0x0f) * s->sectors + (s->sector - 1); } + return sector_num; } =20 @@ -609,20 +611,22 @@ void ide_set_sector(IDEState *s, int64_t sector_num) { unsigned int cyl, r; if (s->select & 0x40) { - if (!s->lba48) { - s->select =3D (s->select & 0xf0) | (sector_num >> 24); - s->hcyl =3D (sector_num >> 16); - s->lcyl =3D (sector_num >> 8); - s->sector =3D (sector_num); - } else { + if (s->lba48) { s->sector =3D sector_num; s->lcyl =3D sector_num >> 8; s->hcyl =3D sector_num >> 16; s->hob_sector =3D sector_num >> 24; s->hob_lcyl =3D sector_num >> 32; s->hob_hcyl =3D sector_num >> 40; + } else { + /* LBA28 */ + s->select =3D (s->select & 0xf0) | (sector_num >> 24); + s->hcyl =3D (sector_num >> 16); + s->lcyl =3D (sector_num >> 8); + s->sector =3D (sector_num); } } else { + /* CHS */ cyl =3D sector_num / (s->heads * s->sectors); r =3D sector_num % (s->heads * s->sectors); s->hcyl =3D cyl >> 8; --=20 2.26.2