[3/4] Use reserved STS bits from PIIX4 chipset to avoid clash in the future

Commit Message

Gleb Natapov Feb. 5, 2009, 1:42 p.m. UTC

Signed-off-by: Gleb Natapov <[e-mail]>
---

 qemu/hw/acpi.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/bios/acpi-dsdt.dsl b/bios/acpi-dsdt.dsl
index f94ab22..1d1a6b5 100755
--- a/bios/acpi-dsdt.dsl
+++ b/bios/acpi-dsdt.dsl
@@ -746,7 +746,7 @@  DefinitionBlock (
 	Name(_HID, "ACPI0006")
 
         Method(_L00) {
-	    Return(\_PR.PRSC())
+            Return(0x01)
         }
 
 #define gen_pci_hotplug(nr)                                       \
@@ -794,7 +794,7 @@  DefinitionBlock (
         }
 
         Method(_L02) {
-            Return(0x01)
+	    Return(\_PR.PRSC())
         }
         Method(_L03) {
             Return(0x01)
diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c
index 60ef43f..c2c60ad 100644
--- a/qemu/hw/acpi.c
+++ b/qemu/hw/acpi.c
@@ -752,13 +752,13 @@  void qemu_system_hot_add_init(const char *cpu_model)
 
 static void enable_processor(struct gpe_regs *g, int cpu)
 {
-    g->sts |= 1;
+    g->sts |= 4;
     g->cpus_sts[cpu/8] |= (1 << (cpu%8));
 }
 
 static void disable_processor(struct gpe_regs *g, int cpu)
 {
-    g->sts |= 1;
+    g->sts |= 4;
     g->cpus_sts[cpu/8] &= ~(1 << (cpu%8));
 }
 
@@ -804,7 +804,7 @@  void qemu_system_cpu_hot_add(int cpu, int state)
         enable_processor(&gpe, cpu);
     else
         disable_processor(&gpe, cpu);
-    if (gpe.en & 1) {
+    if (gpe.en & 4) {
         qemu_set_irq(pm_state->irq, 1);
         qemu_set_irq(pm_state->irq, 0);
     }