diff options
| -rw-r--r-- | hw/core/machine.c | 6 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
2 files changed, 4 insertions, 4 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. diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4d99d69681..654003f44c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -309,7 +309,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .property = "xlevel",\ .value = stringify(0x8000000a),\ },{\ - .driver = "EPYC-IBPB" TYPE_X86_CPU,\ + .driver = "EPYC-IBPB-" TYPE_X86_CPU,\ .property = "xlevel",\ .value = stringify(0x8000000a),\ }, |