Rename fls to qemu_fls

Fix compiler warning on OSX, reported by Andreas Faerber.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5982 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/cutils.c b/cutils.c
index 2d65357ee4988824776df8ccc4a87a9becf68246..9617e083c6434e0b2bccef3d8a6493ee68a13818 100644 (file)
--- a/cutils.c
+++ b/cutils.c
@@ -97,7 +97,7 @@ time_t mktimegm(struct tm *tm)
     return t;
 }
 
-int fls(int i)
+int qemu_fls(int i)
 {
     return 32 - clz32(i);
 }

diff --git a/hw/virtio.c b/hw/virtio.c
index 24a4b267180ea88ee0fb259a809e05e23d80c9dd..dba80f81c05ccae7dd95264307910af5ba826ad9 100644 (file)
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -858,7 +858,7 @@ VirtIODevice *virtio_init_pci(PCIBus *bus, const char *name,
 
     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);

diff --git a/qemu-common.h b/qemu-common.h
index cb5d46541e8b0b4414d1d7a845307c40b68320f6..d3df63ea014b4ce94e70ef3138fb747b4f1a60b2 100644 (file)
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -104,7 +104,7 @@ char *pstrcat(char *buf, int buf_size, const char *s);
 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))