qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Blue Swirl <blauwirbel@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5982] Rename fls to qemu_fls
Date: Thu, 11 Dec 2008 19:37:55 +0000	[thread overview]
Message-ID: <E1LArMB-0002ZP-41@cvs.savannah.gnu.org> (raw)

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))

                 reply	other threads:[~2008-12-11 19:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1LArMB-0002ZP-41@cvs.savannah.gnu.org \
    --to=blauwirbel@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).