From 49382909021fc59f797f0a5a6ac558aecd89021e Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Thu, 12 Feb 2009 09:57:05 +0200
Subject: [PATCH 4/5] Use reserved STS bits from PIIX4 chipset to avoid clash in the future

commit ce24869570262dd53a7bbbdae7e633da0875e9ab

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Glauber Costa <glommer@redhat.com>
Bugzilla: 485291
---
 bios/acpi-dsdt.dsl |    4 ++--
 qemu/hw/acpi.c     |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bios/acpi-dsdt.dsl b/bios/acpi-dsdt.dsl
index 7a7f66b..1ecbbc5 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 d9118c4..2d2e3a4 100644
--- a/qemu/hw/acpi.c
+++ b/qemu/hw/acpi.c
@@ -755,13 +755,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);
     }
-- 
1.6.1