From patchwork Mon Oct 12 16:41:17 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: 529224 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 E4F641402B2 for ; Tue, 13 Oct 2015 03:56:13 +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=NiSHZIE+; dkim-atps=neutral Received: from localhost ([::1]:56730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgOR-0003Lq-Kt for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2015 12:56:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgFk-0005VK-96 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgFg-0002MV-6h for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:11 -0400 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]:33048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgFf-0002MR-Sv for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:08 -0400 Received: by pabrc13 with SMTP id rc13so23448773pab.0 for ; Mon, 12 Oct 2015 09:47: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=NiSHZIE+kxPAipeCQjjdQZa0c6u48L9IlBGu+4DtV/NGNuVOaeQihDfh3hdMPKdaUN Q7fjQLTWjmna0BOiMqVdnAFgERfyKgdeQT7/NtxpD+s04h2mFQbeylH4PeEOz9waRYcI 88sj/uVYEu1N84eKpEOEF2nEkMeowoNxOvnEib4Zp+sOi4alVdi9Rs4bhCamU6MzM/B+ LzadWqIC6dICGJ0D2DmXTPeX60RMxSXTAZH/NuEDFBVjzy5IG4VP1xVh1AejidfYxHYM AAhIswnRPg+yxIT6uPVxutXHP/q4J7ywN80ynY3edQjcAYsOaB4BnSzhMdThd9iJbV26 YXuQ== X-Received: by 10.66.163.228 with SMTP id yl4mr35068120pab.112.1444668427524; Mon, 12 Oct 2015 09:47:07 -0700 (PDT) Received: from localhost (APoitiers-257-1-35-234.w90-38.abo.wanadoo.fr. [90.38.210.234]) by smtp.gmail.com with ESMTPSA id sv9sm19281317pbc.44.2015.10.12.09.47.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 09:47:06 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2015 18:41:17 +0200 Message-Id: <1444668104-22955-24-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-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:400e:c03::229 Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca Subject: [Qemu-devel] [PULL v2 23/50] 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; }