From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epHHO-0000VG-T4 for qemu-devel@nongnu.org; Fri, 23 Feb 2018 12:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epHHJ-0000b7-W3 for qemu-devel@nongnu.org; Fri, 23 Feb 2018 12:37:06 -0500 From: David Hildenbrand Date: Fri, 23 Feb 2018 18:36:57 +0100 Message-Id: <20180223173657.29125-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v1] numa: s390x has no NUMA List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, Eduardo Habkost , Cornelia Huck , Christian Borntraeger , David Hildenbrand Right now it is possible to crash QEMU for s390x by providing e.g. -numa node,nodeid=0,cpus=0-1 Problem is, that numa.c uses mc->cpu_index_to_instance_props as an indicator whether NUMA is supported by a machine type. We don't implement NUMA on s390x (and that concept also doesn't really exist). We need mc->cpu_index_to_instance_props for query-cpus. So let's fix this case. qemu-system-s390x: -numa node,nodeid=0,cpus=0-1: NUMA is not supported by this machine-type Signed-off-by: David Hildenbrand --- numa.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/numa.c b/numa.c index 7e0e789b02..3b9be613d9 100644 --- a/numa.c +++ b/numa.c @@ -80,10 +80,16 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, return; } +#ifdef TARGET_S390X + /* s390x provides cpu_index_to_instance_props but has no NUMA */ + error_report("NUMA is not supported by this machine-type"); + exit(1); +#else if (!mc->cpu_index_to_instance_props) { error_report("NUMA is not supported by this machine-type"); exit(1); } +#endif for (cpus = node->cpus; cpus; cpus = cpus->next) { CpuInstanceProperties props; if (cpus->value >= max_cpus) { -- 2.14.3