From 21bcfdd9a43041720f9370831c694bcb2e11eea4 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 14 Nov 2012 15:54:07 -0500 Subject: [PATCH] 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 Signed-off-by: Jan Kiszka Signed-off-by: Jason Baron Signed-off-by: Anthony Liguori --- hw/acpi_ich9.c | 7 +++++++ 1 file changed, 7 insertions(+) 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); } -- 2.11.4.GIT