[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 06/17] block/nvme: Replace magic value by SCALE_MS definition
From: |
Stefan Hajnoczi |
Subject: |
[PULL v2 06/17] block/nvme: Replace magic value by SCALE_MS definition |
Date: |
Mon, 5 Oct 2020 16:43:12 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Use self-explicit SCALE_MS definition instead of magic value
(missed in similar commit e4f310fe7f5).
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20200922083821.578519-7-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 959569d262..b48f6f2588 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 = 1. */
now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
- deadline = now + timeout_ms * 1000000;
+ deadline = 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 (%"
--
2.26.2
- [PULL v2 00/17] Block patches, Stefan Hajnoczi, 2020/10/05
- [PULL v2 01/17] util/vfio-helpers: Pass page protections to qemu_vfio_pci_map_bar(), Stefan Hajnoczi, 2020/10/05
- [PULL v2 02/17] block/nvme: Map doorbells pages write-only, Stefan Hajnoczi, 2020/10/05
- [PULL v2 03/17] block/nvme: Reduce I/O registers scope, Stefan Hajnoczi, 2020/10/05
- [PULL v2 04/17] block/nvme: Drop NVMeRegs structure, directly use NvmeBar, Stefan Hajnoczi, 2020/10/05
- [PULL v2 05/17] block/nvme: Use register definitions from 'block/nvme.h', Stefan Hajnoczi, 2020/10/05
- [PULL v2 07/17] block: return error-code from bdrv_invalidate_cache, Stefan Hajnoczi, 2020/10/05
- [PULL v2 09/17] block: declare some coroutine functions in block/coroutines.h, Stefan Hajnoczi, 2020/10/05
- [PULL v2 06/17] block/nvme: Replace magic value by SCALE_MS definition,
Stefan Hajnoczi <=
- [PULL v2 08/17] block/io: refactor coroutine wrappers, Stefan Hajnoczi, 2020/10/05
- [PULL v2 10/17] scripts: add block-coroutine-wrapper.py, Stefan Hajnoczi, 2020/10/05
- [PULL v2 12/17] block: drop bdrv_prwv, Stefan Hajnoczi, 2020/10/05
- [PULL v2 11/17] block: generate coroutine-wrapper code, Stefan Hajnoczi, 2020/10/05
- [PULL v2 13/17] block/io: refactor save/load vmstate, Stefan Hajnoczi, 2020/10/05
- [PULL v2 14/17] include/block/block.h: drop non-ascii quotation mark, Stefan Hajnoczi, 2020/10/05
- [PULL v2 15/17] docs: add 'io_uring' option to 'aio' param in qemu-options.hx, Stefan Hajnoczi, 2020/10/05
- [PULL v2 16/17] util/vfio-helpers: Collect IOVA reserved regions, Stefan Hajnoczi, 2020/10/05
- [PULL v2 17/17] util/vfio-helpers: Rework the IOVA allocator to avoid IOVA reserved regions, Stefan Hajnoczi, 2020/10/05
- Re: [PULL v2 00/17] Block patches, Peter Maydell, 2020/10/06