diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-06-15 11:25:23 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-06-24 05:21:38 +0300 |
| commit | 679dd1a957df418453efdd3ed2914dba5cd73773 (patch) | |
| tree | 857364d455ba3943702e90d93e568b5da488273d /hw/acpi/cpu.c | |
| parent | 76623d00ae578335f6c9f31cd13fc5bf1931dbc3 (diff) | |
| download | qemu-679dd1a957df418453efdd3ed2914dba5cd73773.zip qemu-679dd1a957df418453efdd3ed2914dba5cd73773.tar.gz qemu-679dd1a957df418453efdd3ed2914dba5cd73773.tar.bz2 | |
pc: use new CPU hotplug interface since 2.7 machine type
For compatibility reasons PC/Q35 will start with legacy
CPU hotplug interface by default but with new CPU hotplug
AML code since 2.7 machine type. That way legacy firmware
that doesn't use QEMU generated ACPI tables will be
able to continue using legacy CPU hotplug interface.
While new machine type, with firmware supporting QEMU
provided ACPI tables, will generate new CPU hotplug AML,
which will switch to new CPU hotplug interface when
guest OS executes its _INI method on ACPI tables
loading.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/acpi/cpu.c')
| -rw-r--r-- | hw/acpi/cpu.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 401ac0d..c13b65c 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -373,6 +373,15 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, aml_append(field, aml_named_field(CPU_DATA, 32)); aml_append(cpu_ctrl_dev, field); + if (opts.has_legacy_cphp) { + method = aml_method("_INI", 0, AML_SERIALIZED); + /* switch off legacy CPU hotplug HW and use new one, + * on reboot system is in new mode and writing 0 + * in CPU_SELECTOR selects BSP, which is NOP at + * the time _INI is called */ + aml_append(method, aml_store(zero, aml_name(CPU_SELECTOR))); + aml_append(cpu_ctrl_dev, method); + } } aml_append(sb_scope, cpu_ctrl_dev); |