diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-06 14:08:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-06 14:08:04 +0000 |
| commit | 6fb0dae9efa90c2ef41d8aacef296b8959cf1d61 (patch) | |
| tree | f1c167782628fc1ccf5f9703e7363f682085f4c4 /hw/core/machine.c | |
| parent | b0b74e1f17508cb8cef8afd698558db1bd8999cc (diff) | |
| parent | fcd3f2cc124600385dba46c69a80626985c15b50 (diff) | |
| download | focaccia-qemu-6fb0dae9efa90c2ef41d8aacef296b8959cf1d61.tar.gz focaccia-qemu-6fb0dae9efa90c2ef41d8aacef296b8959cf1d61.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
x86 and machine queue, 2019-12-20 Bug fix: * Resolve CPU models to v1 by default (Eduardo Habkost) Cleanup: * Remove incorrect numa_mem_supported checks (Igor Mammedov) # gpg: Signature made Fri 20 Dec 2019 19:19:02 GMT # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-and-machine-pull-request: numa: properly check if numa is supported numa: remove not needed check i386: Resolve CPU models to v1 by default Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 56137e9bf0..73bf1f8572 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -843,7 +843,7 @@ static void machine_initfn(Object *obj) NULL); } - if (mc->numa_mem_supported) { + if (mc->cpu_index_to_instance_props && mc->get_default_cpu_node_id) { ms->numa_state = g_new0(NumaState, 1); } @@ -966,7 +966,7 @@ void machine_run_board_init(MachineState *machine) { MachineClass *machine_class = MACHINE_GET_CLASS(machine); - if (machine_class->numa_mem_supported) { + if (machine->numa_state) { numa_complete_configuration(machine); if (machine->numa_state->num_nodes) { machine_numa_finish_cpu_init(machine); |