[Qemu-devel] [PATCH 13/25] q35: Suppress SMM BIOS initialization under KVM

[Jason Baron]

From: Jan Kiszka <address@hidden>

Same as for i44fx: KVM does not support SMM yet. Signal it initialized
to Seabios to avoid failures.

Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Jason Baron <address@hidden>
---
 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 0d66109..570ce0c 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 "q35.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);
 }
 
-- 
1.7.1