From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v6 01/15] block/nvme: Replace magic value by SCALE_MS definition
Date: Fri, 21 Aug 2020 21:53:45 +0200 [thread overview]
Message-ID: <20200821195359.1285345-2-philmd@redhat.com> (raw)
In-Reply-To: <20200821195359.1285345-1-philmd@redhat.com>
Use self-explicit SCALE_MS definition instead of magic value.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
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 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 = 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.26.2
next prev parent reply other threads:[~2020-08-21 19:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 19:53 [PATCH v6 00/15] block/nvme: Various cleanups required to use multiple queues Philippe Mathieu-Daudé
2020-08-21 19:53 ` Philippe Mathieu-Daudé [this message]
2020-08-21 19:53 ` [PATCH v6 02/15] block/nvme: Avoid further processing if trace event not enabled Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 03/15] block/nvme: Let nvme_create_queue_pair() fail gracefully Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 04/15] block/nvme: Define INDEX macros to ease code review Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 05/15] block/nvme: Improve error message when IO queue creation failed Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 06/15] block/nvme: Use common error path in nvme_add_io_queue() Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 07/15] block/nvme: Rename local variable Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 08/15] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 09/15] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 10/15] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz) Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 11/15] block/nvme: Simplify nvme_init_queue() arguments Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 12/15] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 13/15] block/nvme: Simplify nvme_create_queue_pair() arguments Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 14/15] block/nvme: Extract nvme_poll_queue() Philippe Mathieu-Daudé
2020-08-21 19:53 ` [PATCH v6 15/15] block/nvme: Use an array of EventNotifier Philippe Mathieu-Daudé
2020-09-01 15:27 ` [PATCH v6 00/15] block/nvme: Various cleanups required to use multiple queues Philippe Mathieu-Daudé
2020-09-01 15:52 ` Kevin Wolf
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=20200821195359.1285345-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@redhat.com \
--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).