gwj / at91sam9263 · Commits

Commit 3c892168a02b4ff9ef8c398599940b8f16a32437

Authored by aliguori
1 parent 29203dcf

kvm: Apply SMM-already-initialized workaround on reset (Jan Kiszka) 

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7136 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 11 additions and 6 deletions
hw/acpi.c
  View file @3c89216
... ... @@ -483,13 +483,18 @@ static int pm_load(QEMUFile* f,void* opaque,int version_id)
483 483  
484 484 static void piix4_reset(void *opaque)
485 485 {
486   - PIIX4PMState *s = opaque;
487   - uint8_t *pci_conf = s->dev.config;
  486 + PIIX4PMState *s = opaque;
  487 + uint8_t *pci_conf = s->dev.config;
  488 +
  489 + pci_conf[0x58] = 0;
  490 + pci_conf[0x59] = 0;
  491 + pci_conf[0x5a] = 0;
  492 + pci_conf[0x5b] = 0;
488 493  
489   - pci_conf[0x58] = 0;
490   - pci_conf[0x59] = 0;
491   - pci_conf[0x5a] = 0;
492   - pci_conf[0x5b] = 0;
  494 + if (kvm_enabled()) {
  495 + /* Mark SMM as already inited (until KVM supports SMM). */
  496 + pci_conf[0x5B] = 0x02;
  497 + }
493 498 }
494 499  
495 500 i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
... ...