yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add qemu_ prefix to bitmap_set and bitmap_clear to avoid conflicts. (#1326)

Browse Source 
When unicorn and systemd are combined into a single binary the 2
libraries conflict on bitmap_set and bitmap_clear functions which breaks
unicorn.

Co-authored-by: Nicolae Mogoreanu <mogo@google.com>
This commit is contained in:
mogoreanu
2020-09-16 02:09:10 -07:00
committed by GitHub
parent abe452babc
commit 748aceb760
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qemu/util/bitmap.c
View File

@ -14,7 +14,7 @@
#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
void bitmap_set(unsigned long *map, long start, long nr)
void qemu_bitmap_set(unsigned long *map, long start, long nr)
{
unsigned long *p = map + BIT_WORD(start);
const long size = start + nr;
@ -34,7 +34,7 @@ void bitmap_set(unsigned long *map, long start, long nr)
}
}
void bitmap_clear(unsigned long *map, long start, long nr)
void qemu_bitmap_clear(unsigned long *map, long start, long nr)
{
unsigned long *p = map + BIT_WORD(start);
const long size = start + nr;