From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Stefan Hajnoczi <stefanha@redhat.com>, qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Maxim Levitsky" <mlevitsk@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 01/12] block/nvme: Replace magic value by SCALE_MS definition
Date: Tue, 30 Jun 2020 21:13:07 +0200 [thread overview]
Message-ID: <20200630191318.30021-2-philmd@redhat.com> (raw)
In-Reply-To: <20200630191318.30021-1-philmd@redhat.com>
Use self-explicit SCALE_MS definition instead of magic value.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/nvme.c b/block/nvme.c
index 374e268915..2f5e3c2adf 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 = cpu_to_le32(le32_to_cpu(s->regs->cc) & 0xFE);
/* Wait for CSTS.RDY = 0. */
- deadline = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + timeout_ms * 1000000ULL;
+ deadline = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + timeout_ms * SCALE_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 (%"
--
2.21.3
next prev parent reply other threads:[~2020-06-30 19:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 19:13 [PATCH v2 00/12] block/nvme: Various cleanups required to use multiple queues Philippe Mathieu-Daudé
2020-06-30 19:13 ` Philippe Mathieu-Daudé [this message]
2020-07-01 15:48 ` [PATCH v2 01/12] block/nvme: Replace magic value by SCALE_MS definition Stefan Hajnoczi
2020-06-30 19:13 ` [PATCH v2 02/12] block/nvme: Avoid further processing if trace event not enabled Philippe Mathieu-Daudé
2020-07-01 15:48 ` Stefan Hajnoczi
2020-06-30 19:13 ` [PATCH v2 03/12] block/nvme: Let nvme_create_queue_pair() fail gracefully Philippe Mathieu-Daudé
2020-06-30 19:13 ` [PATCH v2 04/12] block/nvme: Define QUEUE_INDEX macros to ease code review Philippe Mathieu-Daudé
2020-06-30 19:13 ` [PATCH v2 05/12] block/nvme: Rename local variable Philippe Mathieu-Daudé
2020-07-01 15:49 ` Stefan Hajnoczi
2020-06-30 19:13 ` [PATCH v2 06/12] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures Philippe Mathieu-Daudé
2020-07-01 15:51 ` Stefan Hajnoczi
2020-06-30 19:13 ` [PATCH v2 07/12] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset Philippe Mathieu-Daudé
2020-06-30 19:13 ` [PATCH v2 08/12] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz) Philippe Mathieu-Daudé
2020-07-01 15:51 ` Stefan Hajnoczi
2020-06-30 19:13 ` [PATCH v2 09/12] block/nvme: Simplify nvme_init_queue() arguments Philippe Mathieu-Daudé
2020-06-30 19:13 ` [PATCH v2 10/12] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE Philippe Mathieu-Daudé
2020-06-30 19:13 ` [PATCH v2 11/12] block/nvme: Simplify nvme_create_queue_pair() arguments Philippe Mathieu-Daudé
2020-06-30 19:13 ` [PATCH v2 12/12] block/nvme: Use per-queue AIO context Philippe Mathieu-Daudé
2020-07-01 16:03 ` Stefan Hajnoczi
2020-07-04 21:27 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200630191318.30021-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).