diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2019-12-12 13:48:56 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2020-05-11 15:30:22 -0500 |
| commit | cbdfd3865bce5ca48ae4916d9a54461dbe99f49d (patch) | |
| tree | e74edc527e8668b39b6c8e8d393bd77d41d9d188 /hw/arm | |
| parent | 89eebb016dcedf08c26940dcecdab3db026e9e2c (diff) | |
| download | qemu-cbdfd3865bce5ca48ae4916d9a54461dbe99f49d.zip qemu-cbdfd3865bce5ca48ae4916d9a54461dbe99f49d.tar.gz qemu-cbdfd3865bce5ca48ae4916d9a54461dbe99f49d.tar.bz2 | |
numa: properly check if numa is supported
Commit aa57020774b, by mistake used MachineClass::numa_mem_supported
to check if NUMA is supported by machine and also as unrelated change
set it to true for sbsa-ref board.
Luckily change didn't break machines that support NUMA, as the field
is set to true for them.
But the field is not intended for checking if NUMA is supported and
will be flipped to false within this release for new machine types.
Fix it:
- by using previously used condition
!mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id
the first time and then use MachineState::numa_state down the road
to check if NUMA is supported
- dropping stray sbsa-ref chunk
Fixes: aa57020774b690a22be72453b8e91c9b5a68c516
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <1576154936-178362-3-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
(cherry picked from commit fcd3f2cc124600385dba46c69a80626985c15b50)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/sbsa-ref.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 27046cc..c6261d4 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -791,7 +791,6 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data) mc->possible_cpu_arch_ids = sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = sbsa_ref_cpu_index_to_props; mc->get_default_cpu_node_id = sbsa_ref_get_default_cpu_node_id; - mc->numa_mem_supported = true; } static const TypeInfo sbsa_ref_info = { |