diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-05-30 18:23:56 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-06-05 14:59:08 -0300 |
| commit | a0ceb640d083ab583d115fbd2ded14c089044ae8 (patch) | |
| tree | ddaa37a3b8e7b2f0b9c325b2e996577f62bfe4e9 /hw/arm | |
| parent | 1f43571604da85c62f25f3ba6d275b1b5ea76ca2 (diff) | |
| download | qemu-a0ceb640d083ab583d115fbd2ded14c089044ae8.zip qemu-a0ceb640d083ab583d115fbd2ded14c089044ae8.tar.gz qemu-a0ceb640d083ab583d115fbd2ded14c089044ae8.tar.bz2 | |
numa: consolidate cpu_preplug fixups/checks for pc/arm/spapr
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <1496161442-96665-2-git-send-email-imammedo@redhat.com>
[ehabkost: Fix indentation]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/virt.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4db2d42..010f724 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1372,7 +1372,6 @@ static void machvirt_init(MachineState *machine) for (n = 0; n < possible_cpus->len; n++) { Object *cpuobj; CPUState *cs; - int node_id; if (n >= smp_cpus) { break; @@ -1385,19 +1384,8 @@ static void machvirt_init(MachineState *machine) cs = CPU(cpuobj); cs->cpu_index = n; - node_id = possible_cpus->cpus[cs->cpu_index].props.node_id; - if (!possible_cpus->cpus[cs->cpu_index].props.has_node_id) { - /* by default CPUState::numa_node was 0 if it's not set via CLI - * keep it this way for now but in future we probably should - * refuse to start up with incomplete numa mapping */ - node_id = 0; - } - if (cs->numa_node == CPU_UNSET_NUMA_NODE_ID) { - cs->numa_node = node_id; - } else { - /* CPU isn't device_add compatible yet, this shouldn't happen */ - error_setg(&error_abort, "user set node-id not implemented"); - } + numa_cpu_pre_plug(&possible_cpus->cpus[cs->cpu_index], DEVICE(cpuobj), + &error_fatal); if (!vms->secure) { object_property_set_bool(cpuobj, false, "has_el3", NULL); |