From 26efcec158a87133bb6255ae7d3127a5fa6e66fd Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 24 Jul 2015 13:33:09 +0100 Subject: 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 Reviewed-by: Paolo Bonzini Message-id: 1437741192-20955-4-git-send-email-peter.maydell@linaro.org --- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/block') diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 40d4880326..5da41b23cf 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -805,7 +805,7 @@ static int nvme_init(PCIDevice *pci_dev) 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); -- cgit v1.2.3