[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/10] vl.c: Extract -numa "cpus" parsing to separat
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 05/10] vl.c: Extract -numa "cpus" parsing to separate function |
Date: |
Fri, 11 Jan 2013 16:15:03 -0200 |
This will make it easier to refactor that code later.
Signed-off-by: Eduardo Habkost <address@hidden>
---
vl.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/vl.c b/vl.c
index 2c3bbb9..03a826e 100644
--- a/vl.c
+++ b/vl.c
@@ -1052,15 +1052,33 @@ char *get_boot_devices_list(uint32_t *size)
return list;
}
+static void numa_node_parse_cpus(int nodenr, const char *cpus)
+{
+ char *endptr;
+ unsigned long long value, endvalue;
+
+ value = strtoull(cpus, &endptr, 10);
+ if (*endptr == '-') {
+ endvalue = strtoull(endptr+1, &endptr, 10);
+ } else {
+ endvalue = value;
+ }
+
+ if (!(endvalue < MAX_CPUMASK_BITS)) {
+ endvalue = MAX_CPUMASK_BITS - 1;
+ fprintf(stderr, "A max of %d CPUs are supported in a guest\n",
+ MAX_CPUMASK_BITS);
+ }
+
+ bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
+}
+
static void numa_node_add(const char *optarg)
{
char option[128];
char *endptr;
- unsigned long long value, endvalue;
int nodenr;
- value = endvalue = 0ULL;
-
if (nb_numa_nodes >= MAX_NODES) {
fprintf(stderr, "qemu: too many NUMA nodes\n");
exit(1);
@@ -1084,21 +1102,7 @@ static void numa_node_add(const char *optarg)
node_mem[nodenr] = sval;
}
if (get_param_value(option, 128, "cpus", optarg) != 0) {
- value = strtoull(option, &endptr, 10);
- if (*endptr == '-') {
- endvalue = strtoull(endptr+1, &endptr, 10);
- } else {
- endvalue = value;
- }
-
- if (!(endvalue < MAX_CPUMASK_BITS)) {
- endvalue = MAX_CPUMASK_BITS - 1;
- fprintf(stderr,
- "A max of %d CPUs are supported in a guest\n",
- MAX_CPUMASK_BITS);
- }
-
- bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
+ numa_node_parse_cpus(nodenr, option);
}
nb_numa_nodes++;
}
--
1.7.11.7
- [Qemu-devel] [PATCH 08/10] vl.c: Support multiple CPU ranges on -numa option, (continued)
- [Qemu-devel] [PATCH 08/10] vl.c: Support multiple CPU ranges on -numa option, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 01/10] vl.c: Fix off-by-one bug when handling "-numa node" argument, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 06/10] vl.c: handle invalid NUMA CPU ranges properly, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [RFC 09/10] vl.c: Introduce QemuOpts-friendly "-numa-node" config option, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 03/10] vl.c: Isolate code specific to "-numa node" option type, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 04/10] vl.c: Check for NUMA node limit inside numa_node_add(), Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 05/10] vl.c: Extract -numa "cpus" parsing to separate function,
Eduardo Habkost <=
- [Qemu-devel] [RFC 10/10] vl.c: Handle legacy "-numa node, cpus=A, B, C, D" format, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 02/10] vl.c: Abort on unknown -numa option type, Eduardo Habkost, 2013/01/11
- [Qemu-devel] [PATCH 07/10] vl.c: numa_add_node(): Validate nodeid before using it, Eduardo Habkost, 2013/01/11