From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttj70-0001VG-DE for qemu-devel@nongnu.org; Fri, 11 Jan 2013 13:13:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ttj6q-00032z-WD for qemu-devel@nongnu.org; Fri, 11 Jan 2013 13:13:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttj6q-00032T-Nl for qemu-devel@nongnu.org; Fri, 11 Jan 2013 13:13:40 -0500 From: Eduardo Habkost Date: Fri, 11 Jan 2013 16:15:03 -0200 Message-Id: <1357928108-21066-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1357928108-21066-1-git-send-email-ehabkost@redhat.com> References: <1357928108-21066-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 05/10] vl.c: Extract -numa "cpus" parsing to separate function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: libvir-list@redhat.com, Chegu Vinod , Anthony Liguori This will make it easier to refactor that code later. Signed-off-by: Eduardo Habkost --- 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