From patchwork Tue Oct 6 19:19:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 527023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7BDDF140D8B for ; Wed, 7 Oct 2015 09:01:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=WPUGZKBF; dkim-atps=neutral Received: from localhost ([::1]:54277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjaIb-0003DU-8m for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 18:01:29 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=JzLe8lpmTJzGAPEhAGgR6qqsHm8NGzGArsFLFazH0JI=; b=WPUGZKBFfSpm+8TJivUKYVjYo0IFgL6pQkVgqUm83kmBNNw5ZEQM46mfA/agUYaqAa E5itkb9koKICZmpuYklHNrEZx8YQrEM/KNCUToFfZlOWEKJgZrVHUA4zbsZwFJc7VzSw J+Kq1TIBXRYp4f0+YqLQL+l4jB7R0liN1Ai3MUBQ4TdNqOuv+S8Crl0g7Jt79V7icQbM 4OHTvx3eSFHY1eOREv7Cufm+RWXwuVYQgli2oby222XQJ8dvz+0eN0YuvUBKscjQYdVj DhlSIjKtmL1NQ221wo1i23CquuyQXV6sD2LRW1Kt8A0u8LO0GEz3MEywr761b4dSZ3ys gOuQ== X-Received: by 10.140.108.102 with SMTP id i93mr48749498qgf.27.1444159267860; Tue, 06 Oct 2015 12:21:07 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id m26sm9228579qki.28.2015.10.06.12.21.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 12:21:06 -0700 (PDT) From: marcandre.lureau@redhat.com To: peter.maydell@linaro.org Date: Tue, 6 Oct 2015 21:19:18 +0200 Message-Id: <1444159184-18153-23-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 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 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::236 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 22/48] ivshmem: use common is_power_of_2() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; }