From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBGDH-0003c7-8B for qemu-devel@nongnu.org; Mon, 28 Nov 2016 02:18:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBGDE-0004iq-3X for qemu-devel@nongnu.org; Mon, 28 Nov 2016 02:18:55 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:47854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cBGDD-0004ie-T4 for qemu-devel@nongnu.org; Mon, 28 Nov 2016 02:18:52 -0500 From: Yuval Shaia Date: Mon, 28 Nov 2016 09:18:42 +0200 Message-Id: <1480317522-5950-1-git-send-email-yuval.shaia@oracle.com> Subject: [Qemu-devel] [PATCH] include: Add roundup_pow_of_two helper function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, marcel@redhat.com Cc: qemu-devel@nongnu.org, yuval.shaia@oracle.com Move private implementation of rthe function to osdep.h Signed-off-by: Yuval Shaia --- hw/pci/shpc.c | 12 +----------- include/qemu/osdep.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 3dcd472..4b8982d 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -122,16 +122,6 @@ #define SHPC_PCI_TO_IDX(pci_slot) ((pci_slot) - 1) #define SHPC_IDX_TO_PHYSICAL(slot) ((slot) + 1) -static int roundup_pow_of_two(int x) -{ - x |= (x >> 1); - x |= (x >> 2); - x |= (x >> 4); - x |= (x >> 8); - x |= (x >> 16); - return x + 1; -} - static uint16_t shpc_get_status(SHPCDevice *shpc, int slot, uint16_t msk) { uint8_t *status = shpc->config + SHPC_SLOT_STATUS(slot); @@ -654,7 +644,7 @@ int shpc_init(PCIDevice *d, PCIBus *sec_bus, MemoryRegion *bar, unsigned offset) int shpc_bar_size(PCIDevice *d) { - return roundup_pow_of_two(SHPC_SLOT_REG(SHPC_MAX_SLOTS)); + return round_up_pow_of_two(SHPC_SLOT_REG(SHPC_MAX_SLOTS)); } void shpc_cleanup(PCIDevice *d, MemoryRegion *bar) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 689f253..74d5c30 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -194,6 +194,16 @@ extern int daemon(int, int); #define ROUND_UP(n,d) (((n) + (d) - 1) & -(d)) #endif +static inline int round_up_pow_of_two(int x) +{ + x |= (x >> 1); + x |= (x >> 2); + x |= (x >> 4); + x |= (x >> 8); + x |= (x >> 16); + return x + 1; +} + #ifndef DIV_ROUND_UP #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #endif -- 1.8.3.1