[libvirt] [PATCH 03/10] vl.c: Isolate code specific to "-numa node" option type
Extract the code that's specific for the "node" -numa option type (the
only one, today) to a separate function.
The extracted code will eventually become a function specific for a
"numa-node" config section, independent from the numa_add() code.
Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com>
---
vl.c | 75 +++++++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 41 insertions(+), 34 deletions(-)
diff --git a/vl.c b/vl.c
index 042cc7f..94cc6fd 100644
--- a/vl.c
+++ b/vl.c
@@ -1052,7 +1052,7 @@ char *get_boot_devices_list(uint32_t *size)
return list;
}
-static void numa_add(const char *optarg)
+static void numa_node_add(const char *optarg)
{
char option[128];
char *endptr;
@@ -1061,46 +1061,53 @@ static void numa_add(const char *optarg)
value = endvalue = 0ULL;
- optarg = get_opt_name(option, 128, optarg, ',');
- if (*optarg == ',') {
- optarg++;
+ if (get_param_value(option, 128, "nodeid", optarg) == 0) {
+ nodenr = nb_numa_nodes;
+ } else {
+ nodenr = strtoull(option, NULL, 10);
}
- if (!strcmp(option, "node")) {
- if (get_param_value(option, 128, "nodeid", optarg) == 0) {
- nodenr = nb_numa_nodes;
+
+ if (get_param_value(option, 128, "mem", optarg) == 0) {
+ node_mem[nodenr] = 0;
+ } else {
+ int64_t sval;
+ sval = strtosz(option, &endptr);
+ if (sval < 0 || *endptr) {
+ fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg);
+ exit(1);
+ }
+ 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 {
- nodenr = strtoull(option, NULL, 10);
+ endvalue = value;
}
- if (get_param_value(option, 128, "mem", optarg) == 0) {
- node_mem[nodenr] = 0;
- } else {
- int64_t sval;
- sval = strtosz(option, &endptr);
- if (sval < 0 || *endptr) {
- fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg);
- exit(1);
- }
- node_mem[nodenr] = sval;
+ 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);
}
- 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);
+ }
+ nb_numa_nodes++;
+}
- bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
- }
- nb_numa_nodes++;
+static void numa_add(const char *optarg)
+{
+ char option[128];
+
+ optarg = get_opt_name(option, 128, optarg, ',');
+ if (*optarg == ',') {
+ optarg++;
+ }
+ if (!strcmp(option, "node")) {
+ numa_node_add(optarg);
} else {
fprintf(stderr, "Invalid -numa option: %s\n", option);
exit(1);
--
1.7.11.7