From b87d58dde329a7f2ecb3beec47a953c5aa964660 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Thu, 5 Feb 2009 15:42:51 +0200 Subject: [PATCH] Use reserved STS bits from PIIX4 chipset to avoid clash in the future Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity --- hw/acpi.c | 6 +++--- kvm/bios/acpi-dsdt.dsl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index d857149211..5597fd0d98 100644 --- a/hw/acpi.c +++ b/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)); } @@ -801,7 +801,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); } diff --git a/kvm/bios/acpi-dsdt.dsl b/kvm/bios/acpi-dsdt.dsl index 57b87fdb03..06ab25d4a4 100755 --- a/kvm/bios/acpi-dsdt.dsl +++ b/kvm/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) -- 2.11.4.GIT