From patchwork Fri Aug 14 08:28:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 276553 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56BEBC433E1 for ; Fri, 14 Aug 2020 08:29:52 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 22F2C2074D for ; Fri, 14 Aug 2020 08:29:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l2G+AhK5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22F2C2074D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V5z-0005Kg-8R for qemu-devel@archiver.kernel.org; Fri, 14 Aug 2020 04:29:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V4z-0003Nw-3C; Fri, 14 Aug 2020 04:28:49 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V4x-0004Lc-JN; Fri, 14 Aug 2020 04:28:48 -0400 Received: by mail-wm1-x344.google.com with SMTP id k20so7219824wmi.5; Fri, 14 Aug 2020 01:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gPP3i1OySIOEchR+vbmDC0pxKakXyB2ET0Tvdz9ALkE=; b=l2G+AhK5j5qZqgRTf3dVx+u67ook/837XCxGnnpnoecz4K/PgEej3QDYpkhAI7ljq+ +d5MxxFxzi4/WS1I/tkaJnvUH9KHGr6zW+c0efaJ7JROFNnq9BXTb4hQMEeC519o/c6W nx4gLMp7hW316JDLdu2hvDmU00bq3SyUDVZl6ZX4R37sI5Kr5yz0luz0leOpToTAmahD YgsM5h1VRiCYH1F1EGfJrZVtNGayr/MDg+l7PlbDbP0ScpI1YGcc9fRFLzHypRBv+SV6 az4QjZHwEaWN/aFxawYFrqgoiwcn2fH+wgkf2H2R/KBjrvg429E3B/KLSwYKIiRiv4wR LFGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gPP3i1OySIOEchR+vbmDC0pxKakXyB2ET0Tvdz9ALkE=; b=dBDwAscgG7kyOzWZEnucTPDNaysOoeHVZNxQA/9wTlrtnVEOCH+XIg+ybyqBu1FhYW PZ9YI3N8QeTUBySSRNIkt3/pgVlnvDbQDitihv0wlR41/senpLj42E3OfMAVuVHW1NaJ xvhPuNt9q1HUP6Cqw2CoMOkEtzz4gLGeUqTsQi0Bs81zDbIt0DzYEKXafN/y+Sbs1fdm OXblAVc+wYopo+x5DNauZA+F56Ac7M/y23ihZD7C+L852VMjGXPhB2S9baa0+3A4n//1 UIoF2AHC3IYUvFKTRzE7W8jAzzXJ5MOL0l0khGGBvQvqphzCj1+u/GTDiZfFvBvt1tSb ZB0w== X-Gm-Message-State: AOAM531YSmOsdV1ULfFSBySgRcDDHqq7bkPsvq7zsTwmrXB87Qa5XPD8 pE08KwIjXZ/Omx12s8waGrcwc3Kgljc= X-Google-Smtp-Source: ABdhPJzpUYuoXoQ17vWZzlmIOYmvHyXDRkOktOqNsXwTPLrhDUOgsZZwft1I+kZRL+KMDly774xx0w== X-Received: by 2002:a7b:c0d3:: with SMTP id s19mr1499911wmh.84.1597393725130; Fri, 14 Aug 2020 01:28:45 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id d14sm14668107wre.44.2020.08.14.01.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/7] block/null: Make more explicit the driver default size is 1GiB Date: Fri, 14 Aug 2020 10:28:35 +0200 Message-Id: <20200814082841.27000-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814082841.27000-1-f4bug@amsat.org> References: <20200814082841.27000-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Max Reitz , Paolo Bonzini , John Snow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As it is not obvious the default size for the null block driver is 1 GiB, replace the obfuscated '1 << 30' magic value by a definition using IEC binary prefixes. Signed-off-by: Philippe Mathieu-Daudé --- block/null.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/null.c b/block/null.c index 15e1d56746..8354def367 100644 --- a/block/null.c +++ b/block/null.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" @@ -21,6 +22,7 @@ #define NULL_OPT_LATENCY "latency-ns" #define NULL_OPT_ZEROES "read-zeroes" +#define NULL_OPT_SIZE (1 * GiB) typedef struct { int64_t length; @@ -86,7 +88,7 @@ static int null_file_open(BlockDriverState *bs, QDict *options, int flags, opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &error_abort); s->length = - qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 1 << 30); + qemu_opt_get_size(opts, BLOCK_OPT_SIZE, NULL_OPT_SIZE); s->latency_ns = qemu_opt_get_number(opts, NULL_OPT_LATENCY, 0); if (s->latency_ns < 0) { From patchwork Fri Aug 14 08:28:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 276552 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4DB2C433DF for ; Fri, 14 Aug 2020 08:31:41 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6E96B2074D for ; Fri, 14 Aug 2020 08:31:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R/fscXm3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E96B2074D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V7k-0000BE-NO for qemu-devel@archiver.kernel.org; Fri, 14 Aug 2020 04:31:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V53-0003Xu-FP; Fri, 14 Aug 2020 04:28:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V51-0004ME-38; Fri, 14 Aug 2020 04:28:53 -0400 Received: by mail-wr1-x433.google.com with SMTP id f1so7614497wro.2; Fri, 14 Aug 2020 01:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Iye/cBGgUFdbmxaz6sgS3yQXvh0DJ2OzL+FyZ1uhmuc=; b=R/fscXm3OxNrTuTWiZetZYr5co3X/BxtPC8sFoqmIbCRuD02jizE7VrEMS25d0Vev4 87bnU5FD5SB4usBzumk0gplrdBOrl2t1c6esEPMc9Qm7AbCGrtqcuYkgvOtc72qyjP3k ro0zHkARcXOfrnt9bm4lUHG1eFVRQuPe7WYFjFXQYFR+AH/Q+5Z3R1xTeMyizD8NkOW9 XlITZJrglz9pR9qyxEspMcaD+8gOMRnkxoJRx2au+bradv/r8QZR+aaiJsjxfjFob+sG ikU4i7n/saSRRw/76LCH776HFJjvzlMHYmwmhsWAqj7f7BIXg3Qpab2jryGwc0ACyYCS gg3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Iye/cBGgUFdbmxaz6sgS3yQXvh0DJ2OzL+FyZ1uhmuc=; b=FFH3pVcOwdiO3J4Ti6Z0AefyEbe+lLyv5G0YkReOqW8B+bbVOHqFh4rEkUwSM1pxrK /RGbCJPjqAqvVzk97NsRLO9L+pT4t5gRzzufCbuN9iBRbb9myTlw2lcuQlNKOcZEy3Db 9f4K7fMP0bfidbMqh6LDsWykBuOcLpsCMjHj/H+bwZ4HOhGgEOEt/efXOuoigISsRyJu EmWyPQ1zJ5a8cyHiFImzVw1glONv70WQ/bIe2q+KIB07rPcTta6EI3+oa8LPO1VaRiAM Xweqy51YDFEQUwzZXpT/FCUFPGmNkRVry5hsKJ1s6FzxOOhWLKmhZshHCy1uGml6tU0+ /ZaQ== X-Gm-Message-State: AOAM5332zosV99JiBaCCmgOn72xK34AKlke7uTqs59TiuEyD/4/JQ+w4 /FjlbeSnZFLAkfDQkYxMGxA4H7+BXdU= X-Google-Smtp-Source: ABdhPJz2krOF4Sk4sBu4hfRcOeuJw1zBMxCFmgWxUoQAYnfZIl1fZYvXyBG56CWSUI9m0hj8f+ar1Q== X-Received: by 2002:a5d:558a:: with SMTP id i10mr1581637wrv.146.1597393728922; Fri, 14 Aug 2020 01:28:48 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id d14sm14668107wre.44.2020.08.14.01.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/7] hw/ide/ahci: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Fri, 14 Aug 2020 10:28:38 +0200 Message-Id: <20200814082841.27000-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814082841.27000-1-f4bug@amsat.org> References: <20200814082841.27000-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Max Reitz , Paolo Bonzini , John Snow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daudé --- 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 009120f88b..b696c6291a 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; From patchwork Fri Aug 14 08:28:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 276551 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 908EAC433DF for ; Fri, 14 Aug 2020 08:33:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 57E062074D for ; Fri, 14 Aug 2020 08:33:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VWynQV41" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57E062074D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V9R-0002CC-GE for qemu-devel@archiver.kernel.org; Fri, 14 Aug 2020 04:33:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V55-0003cv-DD; Fri, 14 Aug 2020 04:28:55 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34979) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V53-0004N4-Sv; Fri, 14 Aug 2020 04:28:54 -0400 Received: by mail-wr1-x444.google.com with SMTP id f1so7614599wro.2; Fri, 14 Aug 2020 01:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=etBgOERj9PnsiIU1OWuoGsH2uwmn42946LFCXfF1LJ4=; b=VWynQV41LpgWgKjmmFdhEmpTOhhwsGjcU8NfGDsfDSBd67cjZgeRMVTMh1Qmx1UOrw VD8r/jc80h1JOdxHyAoisVXB+OAEGzHY6j4lxZ+OuzeHrHhCYbsKClWJ7KsO0+8zEro3 m5AI3nK9KVAyQT8KH7tRbs25bkwmiQ0S0dNyNmwvKr12ywwV6IEJTvtSwFrU343kN8iX l+z26Y/ml+bfAsu9gYZtjhrtlrlbaUduOKEwY/cqUYBAdlh/gpCmXZs5He+nlFCazzCL td6Ga7kkj5D7nWhue2q3pJDPl1XAX5Zi9DvO6K+/txYDK9STDeFggHbB6afIoTVKhTDb tJng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=etBgOERj9PnsiIU1OWuoGsH2uwmn42946LFCXfF1LJ4=; b=qb0YR766hl9myooHvYGT+3dVFVsmwIdPWe6yRYV2la6Z/5of3xR3M7XCTL8j9gv+jy C/SjybmFRIqmJqgANlvTcMXCaetQsxoYzDRLlZQhvKkcNvnq+mwd+De3BmpCyqqUIM0T mIN6OiLfgVGrqYC1uqpdoouJ69misgCxzCdyCS8FfTxQg/zuicQoJB/CzzIZWRWbWyjU NJuM5Q8GMfMWWuz4BXu5pD7FASDVPX+iC7PUb0c6vGcr1jgCJuPkxYXjQVzbLCZ8HAOU Gsgxm7AMSXy205UG2BTddQ1TbrGaJ96KtrquBZlCvGUJrJjyu3+jF/naQ7ANeEXAP9XN 0VeQ== X-Gm-Message-State: AOAM533jO1MBYcy7qnw6HveR1vFYv1i9pEjIHHsjfiRYk47C5crsO2zq YRkj7sMThNhogykETOqyiFEWXZShPpA= X-Google-Smtp-Source: ABdhPJypItJ7BS6Ak46+S8EZ9vXwvMoQjuorvxaRyWao6o3rJrHTJemFZR/5laAy5CMBPoYrmJHK/g== X-Received: by 2002:a5d:5588:: with SMTP id i8mr1698627wrv.177.1597393731525; Fri, 14 Aug 2020 01:28:51 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id d14sm14668107wre.44.2020.08.14.01.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/7] hw/ide/pci: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Fri, 14 Aug 2020 10:28:40 +0200 Message-Id: <20200814082841.27000-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814082841.27000-1-f4bug@amsat.org> References: <20200814082841.27000-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Max Reitz , Paolo Bonzini , John Snow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 5e85c4ad17..b50091b615 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -138,7 +138,7 @@ static int32_t bmdma_prepare_buf(const IDEDMA *dma, int32_t limit) int l, len; pci_dma_sglist_init(&s->sg, pci_dev, - s->nsector / (BMDMA_PAGE_SIZE / 512) + 1); + s->nsector / (BMDMA_PAGE_SIZE / BDRV_SECTOR_SIZE) + 1); s->io_buffer_size = 0; for(;;) { if (bm->cur_prd_len == 0) {