[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] kvm: Apply SMM-already-initialized workaround o
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 2/7] kvm: Apply SMM-already-initialized workaround on reset |
Date: |
Sat, 11 Apr 2009 19:20:26 +0200 |
User-agent: |
StGIT/0.14.2 |
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/acpi.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/acpi.c b/hw/acpi.c
index 52f50a0..53c1fec 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -483,13 +483,18 @@ static int pm_load(QEMUFile* f,void* opaque,int
version_id)
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,
- [Qemu-devel] [PATCH 0/7] kvm: fix system reset & rework slot management, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 5/7] kvm: improve handling of overlapping slots, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 1/7] kvm: Sync CPU state on reset, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 6/7] vga: Fix inconsistent tracking of map_addr, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 2/7] kvm: Apply SMM-already-initialized workaround on reset,
Jan Kiszka <=
- [Qemu-devel] [PATCH 7/7] vga: Cleanup dirty logging, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 3/7] kvm: Cleanup unmap condition in kvm_set_phys_mem, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 4/7] kvm: Add sanity checks to slot management, Jan Kiszka, 2009/04/11