aboutsummaryrefslogtreecommitdiffstats
path: root/hw/acpi.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-04-01 08:33:06 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-04-01 09:58:48 -0500
commitb33612d03540fda7fa67485f1c20395beb7a2bf0 (patch)
tree2df7b1ef43f26133c37543fd515d8ec6d0d2fa21 /hw/acpi.c
parentd3f822d241d673103046a07874f8a3f37d1cb41b (diff)
Fix -enable-kvm
Make vl.o compiled per target and fix a thinko in hw/acpi.c. It's not trivial to make kvm.h consumable by compiled-once files. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/acpi.c')
-rw-r--r--hw/acpi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/acpi.c b/hw/acpi.c
index 33c6bc85c..5c01c2e3b 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -529,7 +529,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s);
- if (kvm_enabled) {
+ s->kvm_enabled = kvm_enabled;
+ if (s->kvm_enabled) {
/* Mark SMM as already inited to prevent SMM from running. KVM does not
* support SMM mode. */
pci_conf[0x5B] = 0x02;