Commit d7941f4e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-util-2017-02-23' into staging 



option cutils: Fix and clean up number conversions

# gpg: Signature made Thu 23 Feb 2017 19:41:17 GMT
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-util-2017-02-23: (24 commits)
  option: Fix checking of sizes for overflow and trailing crap
  util/cutils: Change qemu_strtosz*() from int64_t to uint64_t
  util/cutils: Return qemu_strtosz*() error and value separately
  util/cutils: Let qemu_strtosz*() optionally reject trailing crap
  qemu-img: Wrap cvtnum() around qemu_strtosz()
  test-cutils: Drop suffix from test_qemu_strtosz_simple()
  test-cutils: Use qemu_strtosz() more often
  util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros
  util/cutils: New qemu_strtosz()
  util/cutils: Rename qemu_strtosz() to qemu_strtosz_MiB()
  util/cutils: New qemu_strtosz_metric()
  test-cutils: Cover qemu_strtosz() around range limits
  test-cutils: Cover qemu_strtosz() with trailing crap
  test-cutils: Cover qemu_strtosz() invalid input
  test-cutils: Add missing qemu_strtosz()... endptr checks
  option: Fix to reject invalid and overflowing numbers
  util/cutils: Clean up control flow around qemu_strtol() a bit
  util/cutils: Clean up variable names around qemu_strtol()
  util/cutils: Rename qemu_strtoll(), qemu_strtoull()
  util/cutils: Rewrite documentation of qemu_strtol() & friends
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6959e452 75cdcd15

hmp.c

+5 −6
Original line number Diff line number Diff line
@@ -1344,12 +1344,11 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
{

    const char *param = qdict_get_str(qdict, "parameter");

    const char *valuestr = qdict_get_str(qdict, "value");

    int64_t valuebw = 0;

    uint64_t valuebw = 0;

    long valueint = 0;

    char *endp;

    Error *err = NULL;

    bool use_int_value = false;

    int i;

    int i, ret;



    for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {

        if (strcmp(param, MigrationParameter_lookup[i]) == 0) {
@@ -1385,9 +1384,9 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
                break;

            case MIGRATION_PARAMETER_MAX_BANDWIDTH:

                p.has_max_bandwidth = true;

                valuebw = qemu_strtosz(valuestr, &endp);

                if (valuebw < 0 || (size_t)valuebw != valuebw

                    || *endp != '\0') {

                ret = qemu_strtosz_MiB(valuestr, NULL, &valuebw);

                if (ret < 0 || valuebw > INT64_MAX

                    || (size_t)valuebw != valuebw) {

                    error_setg(&err, "Invalid size %s", valuestr);

                    goto cleanup;

                }

hw/misc/ivshmem.c

+5 −4
Original line number Diff line number Diff line
@@ -1267,10 +1267,11 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp) 
    if (s->sizearg == NULL) {

        s->legacy_size = 4 << 20; /* 4 MB default */

    } else {

        char *end;

        int64_t size = qemu_strtosz(s->sizearg, &end);

        if (size < 0 || (size_t)size != size || *end != '\0'

            || !is_power_of_2(size)) {

        int ret;

        uint64_t size;



        ret = qemu_strtosz_MiB(s->sizearg, NULL, &size);

        if (ret < 0 || (size_t)size != size || !is_power_of_2(size)) {

            error_setg(errp, "Invalid size %s", s->sizearg);

            return;

        }

include/qemu/cutils.h

+7 −22
Original line number Diff line number Diff line
@@ -130,34 +130,19 @@ int qemu_strtol(const char *nptr, const char **endptr, int base, 
                long *result);

int qemu_strtoul(const char *nptr, const char **endptr, int base,

                 unsigned long *result);

int qemu_strtoll(const char *nptr, const char **endptr, int base,

int qemu_strtoi64(const char *nptr, const char **endptr, int base,

                  int64_t *result);

int qemu_strtoull(const char *nptr, const char **endptr, int base,

int qemu_strtou64(const char *nptr, const char **endptr, int base,

                  uint64_t *result);



int parse_uint(const char *s, unsigned long long *value, char **endptr,

               int base);

int parse_uint_full(const char *s, unsigned long long *value, int base);



/*

 * qemu_strtosz() suffixes used to specify the default treatment of an

 * argument passed to qemu_strtosz() without an explicit suffix.

 * These should be defined using upper case characters in the range

 * A-Z, as qemu_strtosz() will use qemu_toupper() on the given argument

 * prior to comparison.

 */

#define QEMU_STRTOSZ_DEFSUFFIX_EB 'E'

#define QEMU_STRTOSZ_DEFSUFFIX_PB 'P'

#define QEMU_STRTOSZ_DEFSUFFIX_TB 'T'

#define QEMU_STRTOSZ_DEFSUFFIX_GB 'G'

#define QEMU_STRTOSZ_DEFSUFFIX_MB 'M'

#define QEMU_STRTOSZ_DEFSUFFIX_KB 'K'

#define QEMU_STRTOSZ_DEFSUFFIX_B 'B'

int64_t qemu_strtosz(const char *nptr, char **end);

int64_t qemu_strtosz_suffix(const char *nptr, char **end,

                            const char default_suffix);

int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,

                            const char default_suffix, int64_t unit);

int qemu_strtosz(const char *nptr, char **end, uint64_t *result);

int qemu_strtosz_MiB(const char *nptr, char **end, uint64_t *result);

int qemu_strtosz_metric(const char *nptr, char **end, uint64_t *result);



#define K_BYTE     (1ULL << 10)

#define M_BYTE     (1ULL << 20)

#define G_BYTE     (1ULL << 30)

monitor.c

+4 −3
Original line number Diff line number Diff line
@@ -2799,7 +2799,8 @@ static QDict *monitor_parse_arguments(Monitor *mon, 
            break;

        case 'o':

            {

                int64_t val;

                int ret;

                uint64_t val;

                char *end;



                while (qemu_isspace(*p)) {
@@ -2811,8 +2812,8 @@ static QDict *monitor_parse_arguments(Monitor *mon, 
                        break;

                    }

                }

                val = qemu_strtosz(p, &end);

                if (val < 0) {

                ret = qemu_strtosz_MiB(p, &end, &val);

                if (ret < 0 || val > INT64_MAX) {

                    monitor_printf(mon, "invalid size\n");

                    goto fail;

                }

qapi/opts-visitor.c

+4 −7
Original line number Diff line number Diff line
@@ -481,23 +481,20 @@ opts_type_size(Visitor *v, const char *name, uint64_t *obj, Error **errp) 
{

    OptsVisitor *ov = to_ov(v);

    const QemuOpt *opt;

    int64_t val;

    char *endptr;

    int err;



    opt = lookup_scalar(ov, name, errp);

    if (!opt) {

        return;

    }



    val = qemu_strtosz_suffix(opt->str ? opt->str : "", &endptr,

                         QEMU_STRTOSZ_DEFSUFFIX_B);

    if (val < 0 || *endptr) {

    err = qemu_strtosz(opt->str ? opt->str : "", NULL, obj);

    if (err < 0) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,

                   "a size value representible as a non-negative int64");

                   "a size value");

        return;

    }



    *obj = val;

    processed(ov, name);

}