]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
block/nvme: Replace magic value by SCALE_MS definition
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Tue, 22 Sep 2020 08:38:21 +0000 (10:38 +0200)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 5 Oct 2020 08:35:52 +0000 (09:35 +0100)
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

index 959569d262f27c6be2c7bab94895d48407fed45f..b48f6f258819c899936d683365548a426e074765 100644 (file)
@@ -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 (%"