diff options
| author | Carlos Santos | 2019-10-17 14:37:13 +0200 |
|---|---|---|
| committer | Richard Henderson | 2020-01-22 01:18:12 +0100 |
| commit | 00b5032eaddb7193f03f0a28b10286244d2e2a7b (patch) | |
| tree | db60aa670ca04cdc384eef613d6a3d9d5ad1a416 /util | |
| parent | cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN (diff) | |
| download | qemu-00b5032eaddb7193f03f0a28b10286244d2e2a7b.tar.gz qemu-00b5032eaddb7193f03f0a28b10286244d2e2a7b.tar.xz qemu-00b5032eaddb7193f03f0a28b10286244d2e2a7b.zip | |
util/cacheinfo: fix crash when compiling with uClibc
uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE
but the corresponding sysconf calls returns -1, which is a valid result,
meaning that the limit is indeterminate.
Handle this situation using the fallback values instead of crashing due
to an assertion failure.
Signed-off-by: Carlos Santos <casantos@redhat.com>
Message-Id: <20191017123713.30192-1-casantos@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cacheinfo.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/util/cacheinfo.c b/util/cacheinfo.c index ea6f3e99bf..d94dc6adc8 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -93,10 +93,16 @@ static void sys_cache_info(int *isize, int *dsize) static void sys_cache_info(int *isize, int *dsize) { # ifdef _SC_LEVEL1_ICACHE_LINESIZE - *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE); + int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE); + if (tmp_isize > 0) { + *isize = tmp_isize; + } # endif # ifdef _SC_LEVEL1_DCACHE_LINESIZE - *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); + int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE); + if (tmp_dsize > 0) { + *dsize = tmp_dsize; + } # endif } #endif /* sys_cache_info */ |