yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 04:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/cutils: Change qemu_strtosz*() from int64_t to uint64_t

Browse source 
This will permit its use in parse_option_size().

Backports commit f46bfdbfc8f95cf65d7818ef68a801e063c40332 from qemu
This commit is contained in:
Markus Armbruster 2018-03-02 08:58:54 -05:00 committed by Lioncash
parent 8650d0213c
commit 89d8e58718
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qemu/include/qemu/cutils.h
View file

@ -131,9 +131,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base,
int qemu_strtou64(const char *nptr, const char **endptr, int base, int qemu_strtou64(const char *nptr, const char **endptr, int base,
uint64_t *result); uint64_t *result);
int qemu_strtosz(const char *nptr, char **end, int64_t *result); int qemu_strtosz(const char *nptr, char **end, uint64_t *result);
int qemu_strtosz_MiB(const char *nptr, char **end, int64_t *result); int qemu_strtosz_MiB(const char *nptr, char **end, uint64_t *result);
int qemu_strtosz_metric(const char *nptr, char **end, int64_t *result); int qemu_strtosz_metric(const char *nptr, char **end, uint64_t *result);
#define K_BYTE (1ULL << 10) #define K_BYTE (1ULL << 10)
#define M_BYTE (1ULL << 20) #define M_BYTE (1ULL << 20)

4
qemu/target/i386/cpu.c
View file

@ -2182,10 +2182,10 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
/* Special case: */ /* Special case: */
if (!strcmp(name, "tsc-freq")) { if (!strcmp(name, "tsc-freq")) {
int ret; int ret;
int64_t tsc_freq; uint64_t tsc_freq;
ret = qemu_strtosz_metric(val, NULL, &tsc_freq); ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
if (ret < 0) { if (ret < 0 || tsc_freq > INT64_MAX) {
error_setg(errp, "bad numerical value %s", val); error_setg(errp, "bad numerical value %s", val);
return; return;
} }

14
qemu/util/cutils.c
View file

@ -156,7 +156,7 @@ static int64_t suffix_mul(char suffix, int64_t unit)
*/ */
static int do_strtosz(const char *nptr, char **end, static int do_strtosz(const char *nptr, char **end,
const char default_suffix, int64_t unit, const char default_suffix, int64_t unit,
int64_t *result) uint64_t *result)
{ {
int retval; int retval;
char *endptr; char *endptr;
@ -186,7 +186,11 @@ static int do_strtosz(const char *nptr, char **end,
retval = -EINVAL; retval = -EINVAL;
goto out; goto out;
} }
if ((val * mul >= INT64_MAX) || val < 0) { /*
* Values >= 0xfffffffffffffc00 overflow uint64_t after their trip
* through double (53 bits of precision).
*/
if ((val * mul >= 0xfffffffffffffc00) || val < 0) {
retval = -ERANGE; retval = -ERANGE;
goto out; goto out;
} }
@ -203,17 +207,17 @@ out:
return retval; return retval;
} }
int qemu_strtosz(const char *nptr, char **end, int64_t *result) int qemu_strtosz(const char *nptr, char **end, uint64_t *result)
{ {
return do_strtosz(nptr, end, 'B', 1024, result); return do_strtosz(nptr, end, 'B', 1024, result);
} }
int qemu_strtosz_MiB(const char *nptr, char **end, int64_t *result) int qemu_strtosz_MiB(const char *nptr, char **end, uint64_t *result)
{ {
return do_strtosz(nptr, end, 'M', 1024, result); return do_strtosz(nptr, end, 'M', 1024, result);
} }
int qemu_strtosz_metric(const char *nptr, char **end, int64_t *result) int qemu_strtosz_metric(const char *nptr, char **end, uint64_t *result)
{ {
return do_strtosz(nptr, end, 'B', 1000, result); return do_strtosz(nptr, end, 'B', 1000, result);
} }