From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjaI9-0002Ue-CP for qemu-devel@nongnu.org; Tue, 06 Oct 2015 18:01:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjaI8-0008In-IU for qemu-devel@nongnu.org; Tue, 06 Oct 2015 18:01:01 -0400 Received: from mail-qg0-x236.google.com ([2607:f8b0:400d:c04::236]:34624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnQ-0004tX-6r for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:08 -0400 Received: by qgez77 with SMTP id z77so184238618qge.1 for ; Tue, 06 Oct 2015 12:21:07 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Tue, 6 Oct 2015 21:19:18 +0200 Message-Id: <1444159184-18153-23-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> References: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 22/48] ivshmem: use common is_power_of_2() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org From: Marc-André Lureau The common version correctly checks for 0 value case. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- hw/misc/ivshmem.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index fbb6f40..e678b18 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -117,10 +117,6 @@ static inline uint32_t ivshmem_has_feature(IVShmemState *ivs, return (ivs->features & (1 << feature)); } -static inline bool is_power_of_two(uint64_t x) { - return (x & (x - 1)) == 0; -} - /* accessing registers - based on rtl8139 */ static void ivshmem_update_irq(IVShmemState *s) { @@ -632,7 +628,7 @@ static uint64_t ivshmem_get_size(IVShmemState * s, Error **errp) { } /* BARs must be a power of 2 */ - if (!is_power_of_two(value)) { + if (!is_power_of_2(value)) { error_setg(errp, "size must be power of 2"); return 0; } -- 2.4.3