aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/core/machine.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 2077328bcc..a9aeb22f03 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -674,6 +674,7 @@ static void machine_finalize(Object *obj)
g_free(ms->dumpdtb);
g_free(ms->dt_compatible);
g_free(ms->firmware);
+ g_free(ms->device_memory);
}
bool machine_usb(MachineState *machine)
@@ -791,10 +792,9 @@ void machine_run_board_init(MachineState *machine)
{
MachineClass *machine_class = MACHINE_GET_CLASS(machine);
- if (nb_numa_nodes) {
- numa_complete_configuration(machine);
+ numa_complete_configuration(machine);
+ if (nb_numa_nodes)
machine_numa_finish_cpu_init(machine);
- }
/* If the machine supports the valid_cpu_types check and the user
* specified a CPU with -cpu check here that the user CPU is supported.