From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOXs2-0003Oa-Au for qemu-devel@nongnu.org; Fri, 14 Mar 2014 15:34:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOXrv-0005HW-1s for qemu-devel@nongnu.org; Fri, 14 Mar 2014 15:34:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOXru-0005H9-Oh for qemu-devel@nongnu.org; Fri, 14 Mar 2014 15:34:10 -0400 From: Eduardo Habkost Date: Fri, 14 Mar 2014 16:33:55 -0300 Message-Id: <1394825636-8866-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1394825636-8866-1-git-send-email-ehabkost@redhat.com> References: <1394825636-8866-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/7] vl.c: Rename MAX_CPUMASK_BITS to MAX_CPUS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Laszlo Ersek , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" Also, document what the macro is really useful for. Signed-off-by: Eduardo Habkost Reviewed-by: Laszlo Ersek --- Changes v3 -> v4: * s/should/shall/ at the MAX_CPUS comment --- include/sysemu/sysemu.h | 9 ++++++++- vl.c | 10 +++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b90df9a..6bc1a85 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -133,7 +133,14 @@ extern uint8_t qemu_extra_params_fw[2]; extern QEMUClockType rtc_clock; #define MAX_NODES 64 -#define MAX_CPUMASK_BITS 255 + +/* The following shall be true for all CPUs: + * cpu->cpu_index < max_cpus <= MAX_CPUS + * + * Note that cpu->get_arch_id() may be larger than MAX_CPUS. + */ +#define MAX_CPUS 255 + extern int nb_numa_nodes; extern uint64_t node_mem[MAX_NODES]; extern unsigned long *node_cpumask[MAX_NODES]; diff --git a/vl.c b/vl.c index bca5c95..64b38a5 100644 --- a/vl.c +++ b/vl.c @@ -1278,11 +1278,11 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) goto error; } - if (endvalue >= MAX_CPUMASK_BITS) { - endvalue = MAX_CPUMASK_BITS - 1; + if (endvalue >= MAX_CPUS) { + endvalue = MAX_CPUS - 1; fprintf(stderr, "qemu: NUMA: A max of %d VCPUs are supported\n", - MAX_CPUMASK_BITS); + MAX_CPUS); } if (endvalue < value) { @@ -2954,7 +2954,7 @@ int main(int argc, char **argv, char **envp) for (i = 0; i < MAX_NODES; i++) { node_mem[i] = 0; - node_cpumask[i] = bitmap_new(MAX_CPUMASK_BITS); + node_cpumask[i] = bitmap_new(MAX_CPUS); } nb_numa_nodes = 0; @@ -4245,7 +4245,7 @@ int main(int argc, char **argv, char **envp) } for (i = 0; i < nb_numa_nodes; i++) { - if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { + if (!bitmap_empty(node_cpumask[i], MAX_CPUS)) { break; } } -- 1.8.5.3