From nobody Mon Feb 9 21:19:32 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=1597942811; cv=none; d=zohomail.com; s=zohoarc; b=m/gAdmlr9OIQ/i1v+4raDMjh3Sl0AIFHd95QqKgD9ZNWtksbtnYzt8qImcJJ43Ie75oQXdmQKqhegjycMd2uBzARpX1/9EswYHDw/qiN7Xj9t8IqjvWLhgdvUGERQjeTdIetK0ismq2EqqUxBM/WSGdhnv4PAnCEhFNEicM9+ow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597942811; 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=rHEDYeSrjvvdM00HU33Jyl9/4zi6c/EmJ9icWxpRyDY=; b=bMxyGMSi3MSEqjzwUxjDXXGwrykiJx06rk6E9KQmSpgDuFJcLJ52IMJsd6N1FoTKoFxUmts6214yUspBf7BbhJOodsVGwSHl+xi6+Z96yqLD4s2NVe5s5kAnK6xT54TvRSE6s7IZTn0CLejRXw2PtaoLLWC1hNTFNWcnncItpN4= 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 1597942811762968.0030379355932; Thu, 20 Aug 2020 10:00:11 -0700 (PDT) Received: from localhost ([::1]:48496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8nv6-000489-UW for importer@patchew.org; Thu, 20 Aug 2020 13:00:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8nuE-0002fT-L6 for qemu-devel@nongnu.org; Thu, 20 Aug 2020 12:59:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55728 helo=us-smtp-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 1k8nuD-0006A4-1u for qemu-devel@nongnu.org; Thu, 20 Aug 2020 12:59:14 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-2wEAvMIbM82AEPYnC3vkGg-1; Thu, 20 Aug 2020 12:59:10 -0400 Received: by mail-wm1-f69.google.com with SMTP id z10so995213wmi.8 for ; Thu, 20 Aug 2020 09:59:10 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id n5sm4967691wrx.22.2020.08.20.09.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 09:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597942752; 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=rHEDYeSrjvvdM00HU33Jyl9/4zi6c/EmJ9icWxpRyDY=; b=AoRZjnJ0urMnf8AXnnBwIIjjC1GqLgLQqSoyivcyEf4hwNGx6xXKL3J0uJ1CCtOwb3qoMu fQgkjUjC/nFlMYIUIt0ZqNNpboPK7iXI6+9Cja+SJ0FzFQXqlerXpuxgGMbma2xlKcxBGz rDYVDwMSzm/lGnfjUpLHLIqRHLUaKEY= X-MC-Unique: 2wEAvMIbM82AEPYnC3vkGg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rHEDYeSrjvvdM00HU33Jyl9/4zi6c/EmJ9icWxpRyDY=; b=oM1cvfZE9bjvJ/RpVo3K0aG0p6w6D7ofIc2YNl0mFKDXO0uf1voAA3IqPMt0TBLX5w b8R1brTxzBMP7H9VZzQEj2ZMn9w4OgMKoHDqQUUJ7Z+3Eds2HdIhtMM7fG/rIEoRyJYn 6G8+C7yYLDdhwVCbFUg5Ty+h5yLq5EG7mUni6i3HgaGDLrZfunf/25RhsDELapOf7ZoH wO575ZpgP+v03ei+HYUCW0w+AHCE4FaTTYFE9ZmSOaSC9CHSl9CzRPHxpwPyZVvSu+jo 1NDS8CKFqcwqo19WI9zPmO/pAj9fFCHkXtPgwXRzbuzXbwWTR/Uwn36ubQX5odyps2jq wgqw== X-Gm-Message-State: AOAM533jS1DgmRoaq9TtgLZcDcq90VRAHMZgtNVP0yDu/RoV6Ec4pPKt KoIENBRihfy1HJplGvIjI1ZkWg/QMI7ed6Eae0Rv859r5FCgGqyceIxAnR3jTEnkPg4He+7C9LV Y8J8DmTQnvJ8d308= X-Received: by 2002:a7b:c38e:: with SMTP id s14mr4311870wmj.124.1597942749095; Thu, 20 Aug 2020 09:59:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJ1+7nSnEuUcdp2mGQLt76o7rxF/UHkHpx7JEeHP81SvccPF8tsRDQtgOGenvWRH+SuFP1Cw== X-Received: by 2002:a7b:c38e:: with SMTP id s14mr4311850wmj.124.1597942748903; Thu, 20 Aug 2020 09:59:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 01/15] block/nvme: Replace magic value by SCALE_MS definition Date: Thu, 20 Aug 2020 18:58:47 +0200 Message-Id: <20200820165901.1139109-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200820165901.1139109-1-philmd@redhat.com> References: <20200820165901.1139109-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 08:28:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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, Max Reitz , Stefan Hajnoczi , =?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 SCALE_MS definition instead of magic value. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefano Garzarella --- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nvme.c b/block/nvme.c index 374e2689157..2f5e3c2adfa 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -715,7 +715,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, /* Reset device to get a clean state. */ s->regs->cc =3D cpu_to_le32(le32_to_cpu(s->regs->cc) & 0xFE); /* Wait for CSTS.RDY =3D 0. */ - deadline =3D qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + timeout_ms * 100= 0000ULL; + deadline =3D qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + timeout_ms * SCA= LE_MS; while (le32_to_cpu(s->regs->csts) & 0x1) { if (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) > deadline) { error_setg(errp, "Timeout while waiting for device to reset (%" --=20 2.26.2