From nobody Wed Oct 8 10:16:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600763938; cv=none; d=zohomail.com; s=zohoarc; b=f9P9PmjudatI0rWiNf/AFNkZuHChIaNRvZ6HMmnN5+WyFkuWC76FOZ4vFd05z5BROmPUmy4girkXzrra8dqJmfdsosKkF64hU/arj2rTfW61hMkzCmdOQsW5myNOpBgiBIoH/lWWkeDm8d5DKJAlslYFzJ3BTHK1wQgr30413+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600763938; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=eUWquMJ0RxAYROBHIyitnnUFXZeARp+T5e38sU6nK2Y=; b=VjCXoBbPtuB5mVHMPUUFGpwW/MWZ9Gn9fuThwvbBPXkTdJMxUSZq9AUW/4QRIQVTT4cs3Ivbe/Uf68iVY2ZVRFov9/cNGDBdfshuU2GGDuCbnm7otpfZeIe2nRgUk97fKjK7fuq9pG4lOCnnH9disaqfeSXdYfKctHxd4heBLtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1600763938514296.73677644751854; Tue, 22 Sep 2020 01:38:58 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-353-y4JiukvsMQu3lE6RboBzIA-1; Tue, 22 Sep 2020 04:38:55 -0400 Received: by mail-wr1-f69.google.com with SMTP id d13so691699wrr.23 for ; Tue, 22 Sep 2020 01:38:55 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id w14sm25632237wrk.95.2020.09.22.01.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 01:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600763937; 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=eUWquMJ0RxAYROBHIyitnnUFXZeARp+T5e38sU6nK2Y=; b=Ds9l+8kty5UKKfcl6CQSbpiEdeRPK2ZUPDXwVrPknncJhQ+iIz2DFeNcNcb3xZqTRzvVrC 8pciUJJHPph7+3au/ZDW4lzdhOSO8cdLOiGgzCRhuXOZUMhhocrMX5iYVQvQ4umuDVls+9 HKN3V6M9smr5mNbe47Lta+sTbN7xpeU= X-MC-Unique: y4JiukvsMQu3lE6RboBzIA-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=eUWquMJ0RxAYROBHIyitnnUFXZeARp+T5e38sU6nK2Y=; b=HOjYg8N166ldREePiIG9RvSKntWGmx0lDLu7/F1RQabPRhEbjj5lACN82QF1Dvbryg sxQxadg+Z1Kw3YpDc7Z4kCKSMA6uIHr8zSCNpJTXlC7o/37p7JXw4vT0T6H0THD2p+KB qxttIddlB0B1XMDy+ljqBrr/R6NhU/mNDciiCRAKt8zRCuEQsi+L5cIe1DxjJsjgoYxY OpjzVsAgMk1YYjukvy2rPcaHt4t3PM48lPQPps0hnPG4qw09nURqeySL65dVQ8o87+k3 lBX4hhzU+9goqVL8VNnwoBIrsESWW47kQQ5FBbISRFvNgvZ1+w8HvOeHf5ZyN3nu58iy cJEw== X-Gm-Message-State: AOAM533vpvVZCBMUD6Zd885ULJa9bg3XYUL4jabzQMyWFK2+DA5BK5zN 7oJWPqmjysSLZPskyRHUN7JxpAzfuTEmiVy+CNAclRk77yXkgxrAZVnCAOAYKzmjqcTew1k6aAY eJr35zsr27RBCMQ== X-Received: by 2002:adf:cd05:: with SMTP id w5mr4092689wrm.62.1600763934261; Tue, 22 Sep 2020 01:38:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMDy41vws801DLin8/B/65FrcxeUVg0Q3hoNAdcILiV+NbPlRKhPJ/VGhaIGTAI4a2GVAMjw== X-Received: by 2002:adf:cd05:: with SMTP id w5mr4092671wrm.62.1600763934098; Tue, 22 Sep 2020 01:38:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Fam Zheng , Max Reitz , qemu-block@nongnu.org, Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/6] block/nvme: Replace magic value by SCALE_MS definition Date: Tue, 22 Sep 2020 10:38:21 +0200 Message-Id: <20200922083821.578519-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200922083821.578519-1-philmd@redhat.com> References: <20200922083821.578519-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 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use self-explicit SCALE_MS definition instead of magic value (missed in similar commit e4f310fe7f5). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nvme.c b/block/nvme.c index 959569d262f..b48f6f25881 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -772,7 +772,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, CC_EN_MASK); /* Wait for CSTS.RDY =3D 1. */ now =3D qemu_clock_get_ns(QEMU_CLOCK_REALTIME); - deadline =3D now + timeout_ms * 1000000; + deadline =3D now + timeout_ms * SCALE_MS; while (!NVME_CSTS_RDY(le32_to_cpu(regs->csts))) { if (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) > deadline) { error_setg(errp, "Timeout while waiting for device to start (%" --=20 2.26.2