commit 26efcec158a87133bb6255ae7d3127a5fa6e66fd
author Peter Maydell <peter.maydell@linaro.org> Fri Jul 24 13:33:09 2015 +0100
committer Peter Maydell <peter.maydell@linaro.org> Mon Sep 07 14:19:00 2015 +0100
tree 8d058a47d6defafda7da26df8d0c02019bda327b
parent 1d0148fe6c121b21476ac1ba5120f8990e7fe6cd

hw/block/nvme.c: Use pow2ceil() rather than hand-calculation

Use pow2ceil() to round up to the next power of 2, rather
than an inline calculation.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1437741192-20955-4-git-send-email-peter.maydell@linaro.org

hw/block/nvme.c

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 40d4880..5da41b2 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -805,7 +805,7 @@
 
     n->num_namespaces = 1;
     n->num_queues = 64;
-    n->reg_size = 1 << qemu_fls(0x1004 + 2 * (n->num_queues + 1) * 4);
+    n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4);
     n->ns_size = bs_size / (uint64_t)n->num_namespaces;
 
     n->namespaces = g_new0(NvmeNamespace, n->num_namespaces);