diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-18 18:30:52 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-06 18:39:59 +0200 |
| commit | 355023f2010c4df619d88a0dd7012b4b9c74c12c (patch) | |
| tree | 60f388e6585b7075c1a721e14c6ce12f1bd394de /hw/i386/pc_q35.c | |
| parent | fba72476c6b7be60ac74c5bcdc06c61242d1fe4f (diff) | |
pc: add SMM property
The property can take values on, off or auto. The default is "off"
for KVM and pre-2.4 machines, otherwise "auto" (which makes it
available on TCG or on new-enough kernels).
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b0bf2d0525..8aa3a67fdf 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -253,7 +253,7 @@ static void pc_q35_init(MachineState *machine) (pc_machine->vmport != ON_OFF_AUTO_ON), 0xff0104); /* connect pm stuff to lpc */ - ich9_lpc_pm_init(lpc, !kvm_enabled()); + ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pc_machine)); /* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci = pci_create_simple_multifunction(host_bus, @@ -290,7 +290,11 @@ static void pc_q35_init(MachineState *machine) static void pc_compat_2_3(MachineState *machine) { + PCMachineState *pcms = PC_MACHINE(machine); savevm_skip_section_footers(); + if (kvm_enabled()) { + pcms->smm = ON_OFF_AUTO_OFF; + } } static void pc_compat_2_2(MachineState *machine) |