From patchwork Fri Jul 13 10:37:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 170849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 74D092C034B for ; Fri, 13 Jul 2012 20:53:23 +1000 (EST) Received: from localhost ([::1]:51654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpdH9-0002hm-3z for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2012 06:39:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpdGL-0000SA-Pg for qemu-devel@nongnu.org; Fri, 13 Jul 2012 06:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpdGF-0003dm-ST for qemu-devel@nongnu.org; Fri, 13 Jul 2012 06:38:17 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:33094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpdGF-0003dR-Ji for qemu-devel@nongnu.org; Fri, 13 Jul 2012 06:38:11 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Jul 2012 11:38:10 +0100 Received: from d06nrmr1307.portsmouth.uk.ibm.com (9.149.38.129) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 13 Jul 2012 11:38:08 +0100 Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6DAc69k2068566 for ; Fri, 13 Jul 2012 11:38:07 +0100 Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6DAc5iD004572 for ; Fri, 13 Jul 2012 04:38:05 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6DAc5Mk004567; Fri, 13 Jul 2012 04:38:05 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 13 Jul 2012 11:37:59 +0100 Message-Id: <1342175882-4995-3-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342175882-4995-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342175882-4995-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12071310-3548-0000-0000-00000288F895 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.112 Cc: Stefan Weil , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/5] bitops: Fix documentation 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: Stefan Weil Signed-off-by: Stefan Weil Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- bitops.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bitops.h b/bitops.h index b967ef3..c456232 100644 --- a/bitops.h +++ b/bitops.h @@ -319,8 +319,8 @@ static inline uint64_t extract64(uint64_t value, int start, int length) * @value. Bits of @value outside the bit field are not modified. * Bits of @fieldval above the least significant @length bits are * ignored. The bit field must lie entirely within the 32 bit word. - * It is valid to request that all 64 bits are modified (ie @length - * 64 and @start 0). + * It is valid to request that all 32 bits are modified (ie @length + * 32 and @start 0). * * Returns: the modified @value. */ @@ -334,7 +334,7 @@ static inline uint32_t deposit32(uint32_t value, int start, int length, } /** - * deposit32: + * deposit64: * @value: initial value to insert bit field into * @start: the lowest bit in the bit field (numbered from 0) * @length: the length of the bit field @@ -344,7 +344,7 @@ static inline uint32_t deposit32(uint32_t value, int start, int length, * by the @start and @length parameters, and return the modified * @value. Bits of @value outside the bit field are not modified. * Bits of @fieldval above the least significant @length bits are - * ignored. The bit field must lie entirely within the 32 bit word. + * ignored. The bit field must lie entirely within the 64 bit word. * It is valid to request that all 64 bits are modified (ie @length * 64 and @start 0). *