From nobody Sun May 12 17:50:18 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1597393796; cv=none; d=zohomail.com; s=zohoarc; b=W1aZQDzze3q6IPFZi25X9W3eYUQWeiLXjbF+0LvzPW8m/uWODacmNbvbfp+d+6/+TKRtQN1UQiAagoh7iQS5bCe22xCmfxONULaY60iCg72Lo1ih9awl9r+sjlSMMsVH6VQQLmMA4O5oZZjb/cAIKQZTwINPqX870q/QUnPCPgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597393796; 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=gPP3i1OySIOEchR+vbmDC0pxKakXyB2ET0Tvdz9ALkE=; b=MzrGLfu6fPkvjt+K7vkU2mzMgUePfH8mUMivgYrPqJ028mH8tvF5z8CHwL7ZcRf8aHvNi6rv27Xa8BSiyWjucu02KK9EtoKu6l7ge5mscOmxmGYDT+UKBpQwVUqee+fKPhhGr36hmH6vW+CgpgWwJSPydgzUSGcwMQlUEzX6Icw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159739379685616.628016820220523; Fri, 14 Aug 2020 01:29:56 -0700 (PDT) Received: from localhost ([::1]:53832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V63-0005Kg-F7 for importer@patchew.org; Fri, 14 Aug 2020 04:29:55 -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) 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- 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 @@ */ =20 #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 @@ =20 #define NULL_OPT_LATENCY "latency-ns" #define NULL_OPT_ZEROES "read-zeroes" +#define NULL_OPT_SIZE (1 * GiB) =20 typedef struct { int64_t length; @@ -86,7 +88,7 @@ static int null_file_open(BlockDriverState *bs, QDict *op= tions, int flags, opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &error_abort); s->length =3D - qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 1 << 30); + qemu_opt_get_size(opts, BLOCK_OPT_SIZE, NULL_OPT_SIZE); s->latency_ns =3D qemu_opt_get_number(opts, NULL_OPT_LATENCY, 0); if (s->latency_ns < 0) { --=20 2.21.3 From nobody Sun May 12 17:50:18 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1597393794; cv=none; d=zohomail.com; s=zohoarc; b=en8kst14cyXjjYdVcqEwBuIU25drTa8856SHVICbdu49IFBCFn4XbLQL9fp/TFC35u3nj8uDTaXKkSlQmtHPgfvSxGj5/WqoXl9O66v7P4coTbe3+kLZx9uHHdMe5TQvoFLusqZ86kXkzCrKlqvCZDXesckwL66ictnP0QqxSXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597393794; 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=VnW0TLuLRs1VPgIa6dWC3fUE/qf9+L14BI+kE1SJ29k=; b=JmhPuC7Sk/ALJPGY7S49FSLey1CQfiZFA3ezQpoC+Kd5YySN+nSwCwV+ucDl9SQlMkeD+1yaFVUKXdlzepMyotXzfSaBqeuPs40HU7DC+rZJnZNKKlbTr3AMZmXQ0VgjL0Qs5uVoXasCApbmDq2zIRximfqVuRiv0fM3WwJPvqA= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597393794636959.9223872123414; Fri, 14 Aug 2020 01:29:54 -0700 (PDT) Received: from localhost ([::1]:53602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V61-0005FB-C0 for importer@patchew.org; Fri, 14 Aug 2020 04:29:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V50-0003Qd-At; Fri, 14 Aug 2020 04:28:50 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V4y-0004Ln-Oj; Fri, 14 Aug 2020 04:28:49 -0400 Received: by mail-wr1-x441.google.com with SMTP id 88so7615255wrh.3; Fri, 14 Aug 2020 01:28:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:45 -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=VnW0TLuLRs1VPgIa6dWC3fUE/qf9+L14BI+kE1SJ29k=; b=LaHkPBdogkwIArgaMSjCGx/cCOkHzDolzNfcML1FUy5zrUzahrXzdfFruP+4bUO6Ru /vjIsRJdF/D+wAqIOSeNVLTZTPTdBOApt6XdYJW10KpRvTmdRnmUpb/tRZJqFMd6xZve veLsT7935zM6eCkrLXmK3Fli3t48GnCukov3IZ42NQEejUIF/wu4rPqp5QVoygqQ9auX nTwygxLp9ggpl1lR5eXCu+H94vCElFvRDONxcfJYyM7ckRqyXxy4sx0SYePtDnzl0DUM 2DsujdMruiYr7hktUb3aaaWKeeigiqVTQ9n3ShqqbSPDcb/0YkfrxbNOY+vIv2HzygyP rSJA== 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=VnW0TLuLRs1VPgIa6dWC3fUE/qf9+L14BI+kE1SJ29k=; b=ZYQu0gAlyH302zlcaNkn6TIn2EQfqrgy3hvMI5UIRtgL2GVMwtj+75cU55ACz1yog1 KbNhbh774YjEH2T3TYCGPOIa2plC7AeAlFkap2AfwwFsjHBimMDeCNuVVbttcHa4GjQH +imrpZ9jTnuSF/fqk5EBlkN/IqQnoolk3yBXkiCeL8tAgzOwLrRUIbSMCFw9E8+mWnSe uUVQ9zuAjK7oeHrEMRe4tk/Gi098psW2qCXbRAUMxOWfvth2lI4/x/arCOFJBBH19t3D FJ7kyXNaBKx2/oEw8wmAw7j7t286C5bE+a1gvbMlq6wqArmZykj1cfIRrXinkz5koFJv epyQ== X-Gm-Message-State: AOAM533k0mYN2zLmc5f2pQOd7q+60wtXmXg/IIrR+hGICcPY+qjtH8Zl +ZrmHYuyKJ4UE5p5wQRuoOPEExRZudY= X-Google-Smtp-Source: ABdhPJw4ynOOZHcv7Uj1tKwDHntI06BNHOPgMZRnTJEehFIIYzF4XEziSFXpjEDm4u+cAit2pM35wQ== X-Received: by 2002:adf:bbca:: with SMTP id z10mr1596169wrg.425.1597393726386; Fri, 14 Aug 2020 01:28:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/7] hw/ide/core: Trivial typo fix Date: Fri, 14 Aug 2020 10:28:36 +0200 Message-Id: <20200814082841.27000-3-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Kevin Wolf Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- hw/ide/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index d997a78e47..f76f7e5234 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -709,7 +709,7 @@ void ide_cancel_dma_sync(IDEState *s) /* * We can't cancel Scatter Gather DMA in the middle of the * operation or a partial (not full) DMA transfer would reach - * the storage so we wait for completion instead (we beahve + * the storage so we wait for completion instead (we behave * like if the DMA was completed by the time the guest trying * to cancel dma with bmdma_cmd_writeb with BM_CMD_START not * set). --=20 2.21.3 From nobody Sun May 12 17:50:18 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1597393933; cv=none; d=zohomail.com; s=zohoarc; b=TpKiVcGg/Pl5sHeFNgXSYNG1+miHji85g2T2YCSsbeGtn19rOrDiyJ2KH7N75e5sWZDPG4ewHB/MFrrgmaaGVCSziy/3lanyG5u87tN5GyZYIEccnU6WD+fHapEGCVz67a+VpSZ+ZuxiFeuSef/rF1X+wB5j3q9qb4/IUU0DIPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597393933; 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=MHwsW3nEzd0gLVyoTqr0zx54B5tpAsp2Gj+L5fVRrhY=; b=VyhnZwebws3pDdyV3xKBx0tk6EJzGtpZKH3m3HKXBTt/vPZnt60RhdEyKoRUJKGUGgD99WLKambHuoRvoCCLKuT8if6wxUwS1J4ArG27I83PnhmXqIdYTGREH2gvVClc+naDt1N2exLJQi50cf2DRPibeZ0Wu/817lvKhhL/aN0= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597393933230781.5197627726582; Fri, 14 Aug 2020 01:32:13 -0700 (PDT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V8G-0000bY-4c for importer@patchew.org; Fri, 14 Aug 2020 04:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V52-0003U0-17; Fri, 14 Aug 2020 04:28:52 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V50-0004M3-6A; Fri, 14 Aug 2020 04:28:51 -0400 Received: by mail-wr1-x442.google.com with SMTP id f1so7614451wro.2; Fri, 14 Aug 2020 01:28:49 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:47 -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=MHwsW3nEzd0gLVyoTqr0zx54B5tpAsp2Gj+L5fVRrhY=; b=uHNobyX8IN836KBI4XwLZSVIsEA+KOp8gt7K6LC4CaJhMJkQGKOeFig3znr3lR5qiB ILAPAlDrfJ4mfwmJzDwgOBdn/VgcBiSRu7A3KsvUiCxe3X5zZyPkIuVx70sKjhtjM5at JaO13fz2shzzXd9B+alfJprBheIACu13kFHrPjImg9QxLMEQPfbe73C/Jbf5NlcgzVxS VfkpWvZfcRJsmwPHbFWs46DwUTUpFcVqa3CJmOYvud4UZEnC9vdQaIDC7Ge2eZIK0AZq iDJStx1yw87QfCLA+hut+GAy3Q9DAqJREUFQE5WXMhMr7n0xAX+UyabeWTn4j2SkdeVl u7lQ== 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=MHwsW3nEzd0gLVyoTqr0zx54B5tpAsp2Gj+L5fVRrhY=; b=m4EQY+2DTJkkaCDPXe9innuLEM7o/GHZle0kdlahmZRFLJXrrl19bTmLK6jWWyM8mH Rn5AAFiUQlhYtbKz53wZAqTuxFULJsA99BwYznmwgve1SnnWQESahTj1ya7IYZD/zZG0 hewsnddoO9XXmT2jt0UdRL/E0VK7hqNYfN9JbvZHIpBkYtyx3qckKm0H147CTWs9VajT tfmA41UBawmImVFvCkGYbfJUgDeIcRaSW921jSp+7Xca9ubCDcOTuDWHrXMSJ7p543IS wXUECfMMteE9D3v7fHczkqPPUlDr6npbkQ6dWbmvMmGDTIOaRm3zutytigNEIRRSnr1s uM2Q== X-Gm-Message-State: AOAM5312Ro0Cr6oe40jpa7UEz3nM/E9Qs3CdAoMeHm2e820rLpbhKhmo RLKgvg0pznCGIocLAwFf0dWul/TozcY= X-Google-Smtp-Source: ABdhPJzJkrAkaLBKsQWUfnMfCToWt4YCf8RmwVTW5vjXhDhn4elYHu+XWoYV/Axw++1sPsNLFwJcyw== X-Received: by 2002:a5d:4947:: with SMTP id r7mr1673726wrs.165.1597393727667; Fri, 14 Aug 2020 01:28:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/7] hw/ide/core: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Fri, 14 Aug 2020 10:28:37 +0200 Message-Id: <20200814082841.27000-4-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- hw/ide/core.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index f76f7e5234..bcb2aa85fc 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -121,7 +121,7 @@ static void ide_identify(IDEState *s) put_le16(p + 0, 0x0040); put_le16(p + 1, s->cylinders); put_le16(p + 3, s->heads); - put_le16(p + 4, 512 * s->sectors); /* XXX: retired, remove ? */ + put_le16(p + 4, BDRV_SECTOR_SIZE * s->sectors); /* XXX: retired, remov= e ? */ put_le16(p + 5, 512); /* XXX: retired, remove ? */ put_le16(p + 6, s->sectors); padstr((char *)(p + 10), s->drive_serial_str, 20); /* serial number */ @@ -864,7 +864,7 @@ static void ide_dma_cb(void *opaque, int ret) } } =20 - if (s->io_buffer_size > s->nsector * 512) { + if (s->io_buffer_size > s->nsector * BDRV_SECTOR_SIZE) { /* * The PRDs were longer than needed for this request. * The Active bit must remain set after the request completes. @@ -877,7 +877,7 @@ static void ide_dma_cb(void *opaque, int ret) =20 sector_num =3D ide_get_sector(s); if (n > 0) { - assert(n * 512 =3D=3D s->sg.size); + assert(n * BDRV_SECTOR_SIZE =3D=3D s->sg.size); dma_buf_commit(s, s->sg.size); sector_num +=3D n; ide_set_sector(s, sector_num); @@ -894,17 +894,17 @@ static void ide_dma_cb(void *opaque, int ret) /* launch next transfer */ n =3D s->nsector; s->io_buffer_index =3D 0; - s->io_buffer_size =3D n * 512; + s->io_buffer_size =3D n * BDRV_SECTOR_SIZE; prep_size =3D s->bus->dma->ops->prepare_buf(s->bus->dma, s->io_buffer_= size); /* prepare_buf() must succeed and respect the limit */ - assert(prep_size >=3D 0 && prep_size <=3D n * 512); + assert(prep_size >=3D 0 && prep_size <=3D n * BDRV_SECTOR_SIZE); =20 /* * Now prep_size stores the number of bytes in the sglist, and * s->io_buffer_size stores the number of bytes described by the PRDs. */ =20 - if (prep_size < n * 512) { + if (prep_size < n * BDRV_SECTOR_SIZE) { /* * The PRDs are too short for this request. Error condition! * Reset the Active bit and don't raise the interrupt. @@ -1412,7 +1412,8 @@ static bool cmd_identify(IDEState *s, uint8_t cmd) ide_cfata_identify(s); } s->status =3D READY_STAT | SEEK_STAT; - ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE, + ide_transfer_stop); ide_set_irq(s->bus); return false; } else { @@ -1482,7 +1483,7 @@ static bool cmd_write_multiple(IDEState *s, uint8_t c= md) n =3D MIN(s->nsector, s->req_nb_sectors); =20 s->status =3D SEEK_STAT | READY_STAT; - ide_transfer_start(s, s->io_buffer, 512 * n, ide_sector_write); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE * n, ide_sector_w= rite); =20 s->media_changed =3D 1; =20 @@ -1524,7 +1525,7 @@ static bool cmd_write_pio(IDEState *s, uint8_t cmd) =20 s->req_nb_sectors =3D 1; s->status =3D SEEK_STAT | READY_STAT; - ide_transfer_start(s, s->io_buffer, 512, ide_sector_write); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE, ide_sector_write= ); =20 s->media_changed =3D 1; =20 @@ -1678,7 +1679,7 @@ static bool cmd_identify_packet(IDEState *s, uint8_t = cmd) { ide_atapi_identify(s); s->status =3D READY_STAT | SEEK_STAT; - ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE, ide_transfer_sto= p); ide_set_irq(s->bus); return false; } @@ -2559,7 +2560,7 @@ static void ide_init1(IDEBus *bus, int unit) s->unit =3D unit; s->drive_serial =3D drive_serial++; /* we need at least 2k alignment for accessing CDROMs using O_DIRECT */ - s->io_buffer_total_len =3D IDE_DMA_BUF_SECTORS*512 + 4; + s->io_buffer_total_len =3D IDE_DMA_BUF_SECTORS * BDRV_SECTOR_SIZE + 4; s->io_buffer =3D qemu_memalign(2048, s->io_buffer_total_len); memset(s->io_buffer, 0, s->io_buffer_total_len); =20 --=20 2.21.3 From nobody Sun May 12 17:50:18 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1597393915; cv=none; d=zohomail.com; s=zohoarc; b=OXdCYR9n/6VMG8dA0sTYuFXQiAhEaoCWZl86ePkpq6bv2hrgJhl2nzXEh+UYHK4Eiq8S41kGCNa1/Mhi6bn5UKC2p+Db5nMGFg0WDHtAxQivJTZGFDWUuouo4faj/+Y9FtXri41W3Bv9OEJ87nG/yvQGFI6ugwbcyaubx3dNClg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597393915; 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=Iye/cBGgUFdbmxaz6sgS3yQXvh0DJ2OzL+FyZ1uhmuc=; b=EhBGbAXd1P/ZYuHSZHCvJas+/vQqgDNtljwx1kEW5wXxTfKbNN6Ie0PnoJMb5tQDQ6+3vZscrnZHzfhQhz2g2p7O4KzDjxec4XkxQyfiy6GAvm7EuWByQos1HqtwMqnsejwyoj42R1aJV+ehYrWI9AHw+9TR07GM/00L/Wqx40Y= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597393915511625.5091372290617; Fri, 14 Aug 2020 01:31:55 -0700 (PDT) Received: from localhost ([::1]:33466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V7y-0000BE-5V for importer@patchew.org; Fri, 14 Aug 2020 04:31:54 -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) 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- 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 por= t, uint8_t *cmd_fis, if (!ncq_tfs->sector_count) { ncq_tfs->sector_count =3D 0x10000; } - size =3D ncq_tfs->sector_count * 512; + size =3D ncq_tfs->sector_count * BDRV_SECTOR_SIZE; ahci_populate_sglist(ad, &ncq_tfs->sglist, ncq_tfs->cmdh, size, 0); =20 if (ncq_tfs->sglist.size < size) { @@ -1703,7 +1703,8 @@ static int ahci_state_post_load(void *opaque, int ver= sion_id) return -1; } ahci_populate_sglist(ncq_tfs->drive, &ncq_tfs->sglist, - ncq_tfs->cmdh, ncq_tfs->sector_count * 51= 2, + ncq_tfs->cmdh, + ncq_tfs->sector_count * BDRV_SECTOR_SIZE, 0); if (ncq_tfs->sector_count !=3D ncq_tfs->sglist.size >> 9) { return -1; --=20 2.21.3 From nobody Sun May 12 17:50:18 2024 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=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1597393826; cv=none; d=zohomail.com; s=zohoarc; b=R91qN4MVql3AB+eaPmTlee6sddFFC5/yG5xSFL9jx12PMOeEpxZ0cGGzSiKU1sz4i4Ls9A+ln7o7aKdRb2Lszov17nhHCrWrM1VBrSMkazcWVGsRIPpgE9sGs2lbiIpi4z8r7ege+ithvYDAiVWxWEiSmBE+/jBNuYn+suxi15Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597393826; 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=h98y0GZ9oBKT9+HT3S78Zkh8zS/hG43uNb/8d1WCmb4=; b=n+wrAEe/w4tzfmP6OWWLQbkWvwqsJEqmgd9yTC1VWjQAGFQNjzhMY/fV7Y9f6QzV3nf20ME5NmFWo2kisTkjEE14LKbkIvqIk4U9mvEEcdBbeaCuJ5RkqAQ4U85tbwflD92W7kYwgeAvYi1pL2LxbEdSzrHff0W4IGB7LeSi9pY= 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 1597393826837423.35251879918064; Fri, 14 Aug 2020 01:30:26 -0700 (PDT) Received: from localhost ([::1]:56290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V6X-0006JZ-EO for importer@patchew.org; Fri, 14 Aug 2020 04:30:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V54-0003Z9-0S; Fri, 14 Aug 2020 04:28:54 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V52-0004Mg-DW; Fri, 14 Aug 2020 04:28:53 -0400 Received: by mail-wr1-x442.google.com with SMTP id a15so7579617wrh.10; 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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:49 -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=h98y0GZ9oBKT9+HT3S78Zkh8zS/hG43uNb/8d1WCmb4=; b=agL5RyD3B5RKHtua7k8mphgl+uyS4aSxW3jFgGqAsF9A3hz8WynkJrwZTmpeKuhLKo LmqbI3a0OZJej2vKM+UB/rHU1mCgBJ+xnUh+yCuq+Mz/N2EgCiu8yTVtBxvnczXQAOSf 2r5QbosILrhBXPNifdei4TqWFY26AiSOdkn8dIgWHMiHffBB5C7tUa89agxdjGHcSwJI MB2eG5hX5A26ZSgwF9UAcwAHw4zXGwE0PBXFaQ1QWBba8AVTvIJz+76t3JtCTG5fZtYW HsjXZZ4m9+jtN5fzEX7ZtLijYQaCgxEuQZqYgim/sGMP8Qydcj/piFqsjFZY0T4EzXnK wFAg== 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=h98y0GZ9oBKT9+HT3S78Zkh8zS/hG43uNb/8d1WCmb4=; b=ulpdN5DEvtl0D/+tBuUsZdxl8LsAc8KwCUfXHmISxjxsoLigYckrHU4Ru5N7mpFMG7 mQR4Fq0OmVS5Dx+J6u0DLAVFg0zXG0yyFE9NEIMxl7X/rp11G3ZKrJbQX9lmG7LVZdKU HdBTElr8jCKlcE/yubWkGVYlyQIoorHXW5iUJAc6ubIZvD4O2hJVxghiNKY+EfCVvSzH cd9UGxICpe0AzSJ3RliUMSD6Gm5ihlEG/qPfVI6Gb08hwAu9nASgu+Pq6dMvLO8BZryk LGFThpxk9iThvimzsw8XJ2Dxv7SLlq2jhQ47axxnaxgcMbrSCLaql6BYhDDw4ztnQlbO YmdA== X-Gm-Message-State: AOAM531Riu6xzEGppSl+F54nLRcPLBpix8R3JSi/dy53GwO4D3Y/LXNy q2lTDsvf3ZhAr5ZsmabdA6CXHpevvys= X-Google-Smtp-Source: ABdhPJyqUHRXbTjgYIcejArh90LLSHiqaC6dVOeMFts9Tr4fDdG6T46mXoo4vZmRIAv79XbADQ1R0g== X-Received: by 2002:adf:ed85:: with SMTP id c5mr1670129wro.307.1597393730132; Fri, 14 Aug 2020 01:28:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/7] hw/ide/atapi: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Fri, 14 Aug 2020 10:28:39 +0200 Message-Id: <20200814082841.27000-6-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- hw/ide/atapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 17a9d635d8..14a2b0bb2f 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -824,9 +824,9 @@ static void cmd_get_configuration(IDEState *s, uint8_t = *buf) * * Only a problem if the feature/profiles grow. */ - if (max_len > 512) { + if (max_len > BDRV_SECTOR_SIZE) { /* XXX: assume 1 sector */ - max_len =3D 512; + max_len =3D BDRV_SECTOR_SIZE; } =20 memset(buf, 0, max_len); @@ -1186,8 +1186,8 @@ static void cmd_read_dvd_structure(IDEState *s, uint8= _t* buf) } } =20 - memset(buf, 0, max_len > IDE_DMA_BUF_SECTORS * 512 + 4 ? - IDE_DMA_BUF_SECTORS * 512 + 4 : max_len); + memset(buf, 0, max_len > IDE_DMA_BUF_SECTORS * BDRV_SECTOR_SIZE + 4 ? + IDE_DMA_BUF_SECTORS * BDRV_SECTOR_SIZE + 4 : max_len); =20 switch (format) { case 0x00 ... 0x7f: --=20 2.21.3 From nobody Sun May 12 17:50:18 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1597394009; cv=none; d=zohomail.com; s=zohoarc; b=lAR2aNWkG/6FaluNgBhZgNPsvAKmoizACt6FeSpdd5YrgH4cPZnkd2lBwwBP878oT10DICQCmino9pDIOWJCrISDbY8mkPek3/DlZVp8vb6v+apiWhdECveHVrLMEGK1O6tS+0DM32K7d611R27Uf0APsM3ZMC4vfG/4ib8v38s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597394009; 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=etBgOERj9PnsiIU1OWuoGsH2uwmn42946LFCXfF1LJ4=; b=fY3N5RA8dOMwiv0KjozC/eNWe1vv36DX/ptX31s2aUPqPkdxnY5On6PPfgLVCttmVv+qL9l0op8wKA9xrnZrd3LUzdRBtGbFvmvqkMLk866nsr0oofZ0k7S7t0EIN+TYLTfgEG1A34aOtTp7X2bs461si2fuS245Ost4HA5JaKY= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597394009470972.4504054537712; Fri, 14 Aug 2020 01:33:29 -0700 (PDT) Received: from localhost ([::1]:38242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V9U-0002CC-5F for importer@patchew.org; Fri, 14 Aug 2020 04:33:28 -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) 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- 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, int= 32_t limit) int l, len; =20 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 =3D 0; for(;;) { if (bm->cur_prd_len =3D=3D 0) { --=20 2.21.3 From nobody Sun May 12 17:50:18 2024 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=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1597394064; cv=none; d=zohomail.com; s=zohoarc; b=B1y4wE4GOJ3KuOPY1aieBZU9oF+uqoxDTz6YEla1EmWXmOWmW1NA8lvTxrGfB+riHYmW6F6oMCPorqW2/NI4+66CVkopIySFXzSXwUQL0FiTwXz3obLGFKox+8SnP4VK0nGb9gJdRji6ejHA3F9NkQ80Ya8Q09E2rNDlJzSMFG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597394064; 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=kICf/oOlxbEpUy2A8qbGbhAQ8hahnF5MjM5qVIu7nK0=; b=AqTwY5UgnVRfjRfBRYApMoAEcywlBZTwe9lxHmgon73IRuYWdJs87IR9Dar0KL7g3TFgF8yiqikk/KxYKiErnrtjYf41fU1kBYRs/HX85knuazEl5UgHWnfJYgqkM7mcBrjJevTDxIOggjofEDL22Xvunphzf7dSPD6LOwsRkBg= 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 1597394064591988.9881069401007; Fri, 14 Aug 2020 01:34:24 -0700 (PDT) Received: from localhost ([::1]:40394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6VAN-00035x-7u for importer@patchew.org; Fri, 14 Aug 2020 04:34:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V57-0003hh-4J; Fri, 14 Aug 2020 04:28:57 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:32972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V55-0004NW-Dd; Fri, 14 Aug 2020 04:28:56 -0400 Received: by mail-wr1-x442.google.com with SMTP id p20so7619007wrf.0; Fri, 14 Aug 2020 01:28:54 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); 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=kICf/oOlxbEpUy2A8qbGbhAQ8hahnF5MjM5qVIu7nK0=; b=qzLLf7Yeuff1VtLspR4cwk8NlCV0iOBhO5MH5JZaA75iaVM4AEEkQQFF3G7BKFmdux xk6vRYuT3NwxeKvyPnhX8aUi5dpt//MOrv5NbpSK7Np085RPX7TDNlMWm0JDbN1VcCxe nNvqNnCPwD3rEavgdwDvW8xE5GaPdNej2ECwQWYnWThWG2cgDC2rT/nbw5eYTjUMiuBX bq6xFv0rL7LVcvDbvucZnIWaudKsrAEMXNeXqyUpwXB9YDvFTLtfnmdZ9Fc241V7Le/u JZR44J/Jc0OgEXF8EZOHtsqgBOmiL67ongWvq3depPm8vwy9NTXpGea8z720VqsSyj2R OPvQ== 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=kICf/oOlxbEpUy2A8qbGbhAQ8hahnF5MjM5qVIu7nK0=; b=bChvx8W5pE0dHBFPV7LsK3LoJJ5rkTg6c3dehBtlhE8J60jXhnByrT0lk3HP8vh+gP VCvSkfgMRivjBkX9xw9ebq8QfnHaPLnmL5XZXcAIbxyTgu2EXJjokwbVu22s11xDifJ9 ifJ1TjLnf+ccFTTonEYj7AtgV/KJyHzFU1nacmwvBucjolwLSBzq5PH25Pf4FIVuIr52 dUoBj1wYwUEdCUthjnmqOGvO42EUf0LkOFyAxFTvrpjJ8YOY4F42kIsdXO+IgCiiMkGm yA9ZdHNbYHlV0j9d/UWkKOJNr5ZG1cBhn6MZYf82sODpe8Ue7pVmgRFzDbTUCUK8ZQFQ AMXg== X-Gm-Message-State: AOAM533r0WE0m4qAagv3JGkBTflnRUkh1kUuPNfzJRS+tPfNOQ298lk5 2quvIEucf4hLrFbIQbNDkqzflNqzThA= X-Google-Smtp-Source: ABdhPJyWftTMtPmpreoRSjy9cmcWWTgFxxLwHE3TGVrC5Mots5S5rse5xofT6EtCeS9JtWTnTprSuA== X-Received: by 2002:adf:b1dc:: with SMTP id r28mr1658308wra.242.1597393732862; Fri, 14 Aug 2020 01:28:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/7] hw/scsi/scsi-disk: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Fri, 14 Aug 2020 10:28:41 +0200 Message-Id: <20200814082841.27000-8-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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Kevin Wolf Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- hw/scsi/scsi-disk.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 8ce68a9dd6..7612035a4e 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -71,7 +71,7 @@ typedef struct SCSIDiskClass { =20 typedef struct SCSIDiskReq { SCSIRequest req; - /* Both sector and sector_count are in terms of qemu 512 byte blocks. = */ + /* Both sector and sector_count are in terms of BDRV_SECTOR_SIZE bytes= . */ uint64_t sector; uint32_t sector_count; uint32_t buflen; @@ -141,7 +141,7 @@ static void scsi_init_iovec(SCSIDiskReq *r, size_t size) r->buflen =3D size; r->iov.iov_base =3D blk_blockalign(s->qdev.conf.blk, r->buflen); } - r->iov.iov_len =3D MIN(r->sector_count * 512, r->buflen); + r->iov.iov_len =3D MIN(r->sector_count * BDRV_SECTOR_SIZE, r->buflen); qemu_iovec_init_external(&r->qiov, &r->iov, 1); } =20 @@ -311,7 +311,7 @@ static void scsi_read_complete_noio(SCSIDiskReq *r, int= ret) goto done; } =20 - n =3D r->qiov.size / 512; + n =3D r->qiov.size / BDRV_SECTOR_SIZE; r->sector +=3D n; r->sector_count -=3D n; scsi_req_data(&r->req, r->qiov.size); @@ -505,7 +505,7 @@ static void scsi_write_complete_noio(SCSIDiskReq *r, in= t ret) goto done; } =20 - n =3D r->qiov.size / 512; + n =3D r->qiov.size / BDRV_SECTOR_SIZE; r->sector +=3D n; r->sector_count -=3D n; if (r->sector_count =3D=3D 0) { @@ -1284,7 +1284,7 @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *= r, uint8_t *outbuf) } else { /* MODE_SENSE_10 */ outbuf[7] =3D 8; /* Block descriptor length */ } - nb_sectors /=3D (s->qdev.blocksize / 512); + nb_sectors /=3D (s->qdev.blocksize / BDRV_SECTOR_SIZE); if (nb_sectors > 0xffffff) { nb_sectors =3D 0; } @@ -1342,7 +1342,7 @@ static int scsi_disk_emulate_read_toc(SCSIRequest *re= q, uint8_t *outbuf) start_track =3D req->cmd.buf[6]; blk_get_geometry(s->qdev.conf.blk, &nb_sectors); trace_scsi_disk_emulate_read_toc(start_track, format, msf >> 1); - nb_sectors /=3D s->qdev.blocksize / 512; + nb_sectors /=3D s->qdev.blocksize / BDRV_SECTOR_SIZE; switch (format) { case 0: toclen =3D cdrom_read_toc(nb_sectors, outbuf, msf, start_track); @@ -1738,9 +1738,10 @@ static void scsi_write_same_complete(void *opaque, i= nt ret) =20 block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct); =20 - data->nb_sectors -=3D data->iov.iov_len / 512; - data->sector +=3D data->iov.iov_len / 512; - data->iov.iov_len =3D MIN(data->nb_sectors * 512, data->iov.iov_len); + data->nb_sectors -=3D data->iov.iov_len / BDRV_SECTOR_SIZE; + data->sector +=3D data->iov.iov_len / BDRV_SECTOR_SIZE; + data->iov.iov_len =3D MIN(data->nb_sectors * BDRV_SECTOR_SIZE, + data->iov.iov_len); if (data->iov.iov_len) { block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, data->iov.iov_len, BLOCK_ACCT_WRITE); @@ -1805,9 +1806,10 @@ static void scsi_disk_emulate_write_same(SCSIDiskReq= *r, uint8_t *inbuf) =20 data =3D g_new0(WriteSameCBData, 1); data->r =3D r; - data->sector =3D r->req.cmd.lba * (s->qdev.blocksize / 512); - data->nb_sectors =3D nb_sectors * (s->qdev.blocksize / 512); - data->iov.iov_len =3D MIN(data->nb_sectors * 512, SCSI_WRITE_SAME_MAX); + data->sector =3D r->req.cmd.lba * (s->qdev.blocksize / BDRV_SECTOR_SIZ= E); + data->nb_sectors =3D nb_sectors * (s->qdev.blocksize / BDRV_SECTOR_SIZ= E); + data->iov.iov_len =3D MIN(data->nb_sectors * BDRV_SECTOR_SIZE, + SCSI_WRITE_SAME_MAX); data->iov.iov_base =3D buf =3D blk_blockalign(s->qdev.conf.blk, data->iov.iov_len); qemu_iovec_init_external(&data->qiov, &data->iov, 1); @@ -1980,7 +1982,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest = *req, uint8_t *buf) if ((req->cmd.buf[8] & 1) =3D=3D 0 && req->cmd.lba) { goto illegal_request; } - nb_sectors /=3D s->qdev.blocksize / 512; + nb_sectors /=3D s->qdev.blocksize / BDRV_SECTOR_SIZE; /* Returned value is the address of the last sector. */ nb_sectors--; /* Remember the new size for read/write sanity checking. */ @@ -2049,7 +2051,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest = *req, uint8_t *buf) if ((req->cmd.buf[14] & 1) =3D=3D 0 && req->cmd.lba) { goto illegal_request; } - nb_sectors /=3D s->qdev.blocksize / 512; + nb_sectors /=3D s->qdev.blocksize / BDRV_SECTOR_SIZE; /* Returned value is the address of the last sector. */ nb_sectors--; /* Remember the new size for read/write sanity checking. */ @@ -2180,8 +2182,8 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req= , uint8_t *buf) if (!check_lba_range(s, r->req.cmd.lba, len)) { goto illegal_lba; } - r->sector =3D r->req.cmd.lba * (s->qdev.blocksize / 512); - r->sector_count =3D len * (s->qdev.blocksize / 512); + r->sector =3D r->req.cmd.lba * (s->qdev.blocksize / BDRV_SECTOR_SI= ZE); + r->sector_count =3D len * (s->qdev.blocksize / BDRV_SECTOR_SIZE); break; case WRITE_6: case WRITE_10: @@ -2211,8 +2213,8 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req= , uint8_t *buf) if (!check_lba_range(s, r->req.cmd.lba, len)) { goto illegal_lba; } - r->sector =3D r->req.cmd.lba * (s->qdev.blocksize / 512); - r->sector_count =3D len * (s->qdev.blocksize / 512); + r->sector =3D r->req.cmd.lba * (s->qdev.blocksize / BDRV_SECTOR_SI= ZE); + r->sector_count =3D len * (s->qdev.blocksize / BDRV_SECTOR_SIZE); break; default: abort(); @@ -2229,9 +2231,9 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req= , uint8_t *buf) } assert(r->iov.iov_len =3D=3D 0); if (r->req.cmd.mode =3D=3D SCSI_XFER_TO_DEV) { - return -r->sector_count * 512; + return -r->sector_count * BDRV_SECTOR_SIZE; } else { - return r->sector_count * 512; + return r->sector_count * BDRV_SECTOR_SIZE; } } =20 @@ -2243,7 +2245,7 @@ static void scsi_disk_reset(DeviceState *dev) scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET)); =20 blk_get_geometry(s->qdev.conf.blk, &nb_sectors); - nb_sectors /=3D s->qdev.blocksize / 512; + nb_sectors /=3D s->qdev.blocksize / BDRV_SECTOR_SIZE; if (nb_sectors) { nb_sectors--; } --=20 2.21.3