diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2013-02-04 16:27:52 -0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-04 14:38:35 -0600 |
commit | c881e20eed4911ab6f8c674f2b1bf225a2cdde71 (patch) | |
tree | 4e4a5e8b9c5e04ab39604c59ad3ea876a992cad2 /vl.c | |
parent | 845e5bf9cd49873c72f84796cabf107c3f520f37 (diff) | |
download | hqemu-c881e20eed4911ab6f8c674f2b1bf225a2cdde71.zip hqemu-c881e20eed4911ab6f8c674f2b1bf225a2cdde71.tar.gz |
vl.c: validate -numa "cpus" parameter properly
- Accept empty strings without aborting
- Use parse_uint*() to parse numbers
- Abort if anything except '-' or end-of-string is found after the first
number.
- Check for endvalue < value
Also change the MAX_CPUMASK_BITS warning message from "A max of %d CPUs
are supported in a guest" to "qemu: NUMA: A max of %d VCPUs are
supported".
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 32 |
1 files changed, 27 insertions, 5 deletions
@@ -1249,21 +1249,43 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) char *endptr; unsigned long long value, endvalue; - value = strtoull(cpus, &endptr, 10); + /* Empty CPU range strings will be considered valid, they will simply + * not set any bit in the CPU bitmap. + */ + if (!*cpus) { + return; + } + + if (parse_uint(cpus, &value, &endptr, 10) < 0) { + goto error; + } if (*endptr == '-') { - endvalue = strtoull(endptr+1, &endptr, 10); - } else { + if (parse_uint_full(endptr + 1, &endvalue, 10) < 0) { + goto error; + } + } else if (*endptr == '\0') { endvalue = value; + } else { + goto error; } - if (!(endvalue < MAX_CPUMASK_BITS)) { + if (endvalue >= MAX_CPUMASK_BITS) { endvalue = MAX_CPUMASK_BITS - 1; fprintf(stderr, - "A max of %d CPUs are supported in a guest\n", + "qemu: NUMA: A max of %d VCPUs are supported\n", MAX_CPUMASK_BITS); } + if (endvalue < value) { + goto error; + } + bitmap_set(node_cpumask[nodenr], value, endvalue-value+1); + return; + +error: + fprintf(stderr, "qemu: Invalid NUMA CPU range: %s\n", cpus); + exit(1); } static void numa_add(const char *optarg) |