diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-11-14 15:54:07 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 09:35:37 -0600 |
| commit | 21bcfdd9a43041720f9370831c694bcb2e11eea4 (patch) | |
| tree | 80d192f5aad5cdc2c092b76d46851afedb65c0a5 | |
| parent | a1c9304683161a68c1fc1d9c3bc174ec8e26a61a (diff) | |
| download | qemu-21bcfdd9a43041720f9370831c694bcb2e11eea4.tar.gz | |
q35: Suppress SMM BIOS initialization under KVM
Same as for i44fx: KVM does not support SMM yet. Signal it initialized
to Seabios to avoid failures.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/acpi_ich9.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index c45921c243..61034d3bd7 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -28,6 +28,7 @@ #include "qemu-timer.h" #include "sysemu.h" #include "acpi.h" +#include "kvm.h" #include "ich9.h" @@ -292,6 +293,12 @@ static void pm_reset(void *opaque) acpi_pm_tmr_reset(&pm->acpi_regs); acpi_gpe_reset(&pm->acpi_regs); + if (kvm_enabled()) { + /* Mark SMM as already inited to prevent SMM from running. KVM does not + * support SMM mode. */ + pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN; + } + pm_update_sci(pm); } |