[Qemu-devel] [7136] kvm: Apply SMM-already-initialized workaround on reset (Jan Kiszka)

[Anthony Liguori]

Revision: 7136
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7136
Author:   aliguori
Date:     2009-04-17 14:26:21 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
kvm: Apply SMM-already-initialized workaround on reset (Jan Kiszka)

Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/acpi.c

Modified: trunk/hw/acpi.c
===================================================================
--- trunk/hw/acpi.c     2009-04-17 14:26:17 UTC (rev 7135)
+++ trunk/hw/acpi.c     2009-04-17 14:26:21 UTC (rev 7136)
@@ -483,13 +483,18 @@
 
 static void piix4_reset(void *opaque)
 {
-       PIIX4PMState *s = opaque;
-       uint8_t *pci_conf = s->dev.config;
+    PIIX4PMState *s = opaque;
+    uint8_t *pci_conf = s->dev.config;
 
-       pci_conf[0x58] = 0;
-       pci_conf[0x59] = 0;
-       pci_conf[0x5a] = 0;
-       pci_conf[0x5b] = 0;
+    pci_conf[0x58] = 0;
+    pci_conf[0x59] = 0;
+    pci_conf[0x5a] = 0;
+    pci_conf[0x5b] = 0;
+
+    if (kvm_enabled()) {
+        /* Mark SMM as already inited (until KVM supports SMM). */
+        pci_conf[0x5B] = 0x02;
+    }
 }
 
 i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,