From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LArMC-0002b7-Ls
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:37:56 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LArMC-0002aj-2F
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:37:56 -0500
Received: from [199.232.76.173] (port=36818 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LArMB-0002ag-SQ
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:37:55 -0500
Received: from savannah.gnu.org ([199.232.41.3]:38293 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LArMB-0001W5-JA
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:37:55 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LArMB-0002ZT-AY
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 19:37:55 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LArMB-0002ZP-41
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 19:37:55 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LArMB-0002ZP-41@cvs.savannah.gnu.org>
Date: Thu, 11 Dec 2008 19:37:55 +0000
Subject: [Qemu-devel] [5982] Rename fls to qemu_fls
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5982
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5982
Author:   blueswir1
Date:     2008-12-11 19:37:54 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
Rename fls to qemu_fls

Fix compiler warning on OSX, reported by Andreas Faerber.

Modified Paths:
--------------
    trunk/cutils.c
    trunk/hw/virtio.c
    trunk/qemu-common.h

Modified: trunk/cutils.c
===================================================================
--- trunk/cutils.c	2008-12-11 19:20:41 UTC (rev 5981)
+++ trunk/cutils.c	2008-12-11 19:37:54 UTC (rev 5982)
@@ -97,7 +97,7 @@
     return t;
 }
 
-int fls(int i)
+int qemu_fls(int i)
 {
     return 32 - clz32(i);
 }

Modified: trunk/hw/virtio.c
===================================================================
--- trunk/hw/virtio.c	2008-12-11 19:20:41 UTC (rev 5981)
+++ trunk/hw/virtio.c	2008-12-11 19:37:54 UTC (rev 5982)
@@ -858,7 +858,7 @@
 
     size = 20 + config_size;
     if (size & (size-1))
-        size = 1 << fls(size);
+        size = 1 << qemu_fls(size);
 
     pci_register_io_region(pci_dev, 0, size, PCI_ADDRESS_SPACE_IO,
                            virtio_map);

Modified: trunk/qemu-common.h
===================================================================
--- trunk/qemu-common.h	2008-12-11 19:20:41 UTC (rev 5981)
+++ trunk/qemu-common.h	2008-12-11 19:37:54 UTC (rev 5982)
@@ -104,7 +104,7 @@
 int strstart(const char *str, const char *val, const char **ptr);
 int stristart(const char *str, const char *val, const char **ptr);
 time_t mktimegm(struct tm *tm);
-int fls(int i);
+int qemu_fls(int i);
 
 #define qemu_isalnum(c)		isalnum((unsigned char)(c))
 #define qemu_isalpha(c)		isalpha((unsigned char)(c))