falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numa: we don't implement NUMA for s390x 

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 for s390x ("topology") yet. However we need
mc->cpu_index_to_instance_props for query-cpus.

So let's fix this case by also checking for mc->get_default_cpu_node_id,
which will be needed by machine_set_cpu_numa_node().

qemu-system-s390x: -numa node,nodeid=0,cpus=0-1: NUMA is not supported by
                   this machine-type

While at it, make s390_cpu_index_to_props() look like on other
architectures.

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180227110255.20999-1-david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2018-02-27 12:02:55 +01:00 committed by Cornelia Huck
parent 3c4e9baacf
commit 81ce6aa51a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/s390x/s390-virtio-ccw.c
View File

@ -390,12 +390,14 @@ static void s390_machine_device_unplug_request(HotplugHandler *hotplug_dev,
} }
} }
static CpuInstanceProperties s390_cpu_index_to_props(MachineState *machine, static CpuInstanceProperties s390_cpu_index_to_props(MachineState *ms,
unsigned cpu_index) unsigned cpu_index)
{ {
g_assert(machine->possible_cpus && cpu_index < machine->possible_cpus->len); MachineClass *mc = MACHINE_GET_CLASS(ms);
const CPUArchIdList *possible_cpus = mc->possible_cpu_arch_ids(ms);
return machine->possible_cpus->cpus[cpu_index].props; assert(cpu_index < possible_cpus->len);
return possible_cpus->cpus[cpu_index].props;
} }
static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms) static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)

2
numa.c
View File

@ -80,7 +80,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
return; return;
} }
if (!mc->cpu_index_to_instance_props) { if (!mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id) {
error_report("NUMA is not supported by this machine-type"); error_report("NUMA is not supported by this machine-type");
exit(1); exit(1);
} }