From 08bba95bd3782c74de9cac29e6f8f6b7a5d50392 Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Wed, 22 Oct 2014 11:24:27 +0800 Subject: acpi:piix4: convert cpu hotplug to hotplug_handler API Convert notifier based hotplug to hotplug_handler API, and remove the unused AcpiCpuHotplug_add(). Reviewed-by: Igor Mammedov Signed-off-by: Gu Zheng Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- hw/acpi/cpu_hotplug.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'hw/acpi/cpu_hotplug.c') diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 06e9c6101c..b69b16c0e2 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -49,22 +49,12 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, return; } - AcpiCpuHotplug_add(&ar->gpe, g, cpu); + ar->gpe.sts[0] |= ACPI_CPU_HOTPLUG_STATUS; + g->sts[cpu_id / 8] |= (1 << (cpu_id % 8)); acpi_update_sci(ar, irq); } -void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu) -{ - CPUClass *k = CPU_GET_CLASS(cpu); - int64_t cpu_id; - - *gpe->sts = *gpe->sts | ACPI_CPU_HOTPLUG_STATUS; - cpu_id = k->get_arch_id(CPU(cpu)); - g_assert((cpu_id / 8) < ACPI_GPE_PROC_LEN); - g->sts[cpu_id / 8] |= (1 << (cpu_id % 8)); -} - void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner, AcpiCpuHotplug *gpe_cpu, uint16_t base) { -- cgit v1.2.3