From b33612d03540fda7fa67485f1c20395beb7a2bf0 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 1 Apr 2010 08:33:06 -0500 Subject: 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 --- hw/acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/acpi.c') 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; -- cgit v1.2.3