From patchwork Tue Sep 1 14:09:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1355057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bgq4r1zMbz9sVk for ; Wed, 2 Sep 2020 00:21:32 +1000 (AEST) Received: from localhost ([::1]:56086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7AA-00035p-52 for incoming@patchwork.ozlabs.org; Tue, 01 Sep 2020 10:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD6zQ-0005hX-IS; Tue, 01 Sep 2020 10:10:24 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD6zN-0003uX-Un; Tue, 01 Sep 2020 10:10:24 -0400 Received: from localhost.localdomain ([82.252.135.186]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYvTs-1k8f0I2cWe-00UsG5; Tue, 01 Sep 2020 16:10:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 26/44] hw/ide/ahci: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Tue, 1 Sep 2020 16:09:36 +0200 Message-Id: <20200901140954.889743-27-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200901140954.889743-1-laurent@vivier.eu> References: <20200901140954.889743-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:xxDhq+TV0IfhP9YC17vf1ffp70QmhzJ+LSLjKKD9ZRHGqPWKsWI dfMp6LQG9bu0HuMAOhgCjrfL4jmvrzdVCMHJCKzHMrTMO8pTnrj0JUXGDPhqy9RjENZYxDk ZeqE0vMA+F9m07Q7KsL1ucznABmEKRh3aBMiRuLFOzEjexUZQCJaH95fnYrNdju4X0N+bqu ml90btsCLsq6qiwbXix/w== X-UI-Out-Filterresults: notjunk:1;V03:K0:D8jVz6yqPOU=:xLlTOrRID3d6tMfvRLF1Mp M7hjRbUmlidApPd0IsDWxMTLXVM1V8yTNCkMIZh9mUa3yLQPpK7T8zbEoUWvGMJN5H8NO5XCN CInWGHTtdKkKGeV9dCT8grtgUPLntUJuPCttFshMnLjgPOH0UqL7UvTVXca9GWb4na2+s0ANl rH5PV23JuqZSkCIcxhcHR3CD42/GHyzUb+dKdMFVXkBIJWS6Y01OB+9n7MhpT0pmKc3ICetvn rSzQac05LCNWWxdawI0uJtQBeMjTVSmkM5sdaQi8Bo37OepCT2llLZVLqfr0wW6XUyE1sy+v/ byj5SxvFZOYX9bPF3LhmfYWK9+VMv62e3MW0xfKToZMFRVgkbZ+aZl1i0sv2OSxejO51fcQjY FKddVNk1MLTNRz8Wh4cfXC0yTxExLqYSbG9t14XeoGnDfx53dc0Kph4m3Fl4BjB5N51A+zAw1 1e983eLJBN2ORK4UQVMqKCwj4q/+XWwRrxZVdkp2iR/AdQ+b7hXeCY2ZC5iIBgIx6k+T/3zSu Fvrq/96h/cYNpzuiJV8N/8Ovdhdp4YYEZtDOIGGagXsQuMkOROIvdkl0mHlKwfF2mc8xijNRb BnKu7JiOE5OENTWSiNHHPAy7k7RNDLf4Aj9+PLdowls3PZMyeDckmBI2lg7ZbU0IMCsF+zkUu ssOaLBYXD2cnXa2LwS+xqQCk9QGsupLJEikydcjCufwJ0zkoGjhb5JOkKK4UzNbZobPQRt1ES 5eLDYu21KGZMdqjcq3rzeZ5Us6QrHVbDgy0/s8qPQkClJqlEjGjniD4LD3Z/cVZzRCkcXee1m xgZeNSXjowMALY5VkOXiXqVMydB4KVX1ZAeZfCmN7oUThp/afhMt8VqLdiYN4q92jeYInAy Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 10:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: qemu-trivial@nongnu.org, Li Qiang , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella Message-Id: <20200814082841.27000-5-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/ide/ahci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 009120f88b78..b696c6291a38 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1151,7 +1151,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, if (!ncq_tfs->sector_count) { ncq_tfs->sector_count = 0x10000; } - size = ncq_tfs->sector_count * 512; + size = ncq_tfs->sector_count * BDRV_SECTOR_SIZE; ahci_populate_sglist(ad, &ncq_tfs->sglist, ncq_tfs->cmdh, size, 0); if (ncq_tfs->sglist.size < size) { @@ -1703,7 +1703,8 @@ static int ahci_state_post_load(void *opaque, int version_id) return -1; } ahci_populate_sglist(ncq_tfs->drive, &ncq_tfs->sglist, - ncq_tfs->cmdh, ncq_tfs->sector_count * 512, + ncq_tfs->cmdh, + ncq_tfs->sector_count * BDRV_SECTOR_SIZE, 0); if (ncq_tfs->sector_count != ncq_tfs->sglist.size >> 9) { return -1;