| Message ID | 1411987957-31190-2-git-send-email-guz.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 29 Sep 2014 18:52:30 +0800 Gu Zheng <guz.fnst@cn.fujitsu.com> wrote: > v4: > -convert CPUState *cpu to DeviceState *dev like it's done for other handlers > and do cast to CPU inside. > > v2: > -add errp argument to catch error. > -return error instead of aborting if cpu id is invalid. > -make acpi_cpu_plug_cb as a wrapper around AcpiCpuHotplug_add. > > Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com> > --- Changelog is usually put below this line, so it wouldn't stay in commit message + into a cover letter of series. The same applies to the rest of patches in series. > hw/acpi/cpu_hotplug.c | 18 ++++++++++++++++++ > include/hw/acpi/cpu_hotplug.h | 3 +++ > 2 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c > index 2ad83a0..06e9c61 100644 > --- a/hw/acpi/cpu_hotplug.c > +++ b/hw/acpi/cpu_hotplug.c > @@ -36,6 +36,24 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = { > }, > }; > > +void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, > + AcpiCpuHotplug *g, DeviceState *dev, Error **errp) > +{ > + CPUState *cpu = CPU(dev); > + CPUClass *k = CPU_GET_CLASS(cpu); > + int64_t cpu_id; > + > + cpu_id = k->get_arch_id(cpu); > + if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) { > + error_setg(errp, "acpi: invalid cpu id: %" PRIi64, cpu_id); > + return; > + } > + > + AcpiCpuHotplug_add(&ar->gpe, g, cpu); > + > + acpi_update_sci(ar, irq); > +} > + > void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu) > { > CPUClass *k = CPU_GET_CLASS(cpu); > diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h > index 9e5d30c..5dca8d7 100644 > --- a/include/hw/acpi/cpu_hotplug.h > +++ b/include/hw/acpi/cpu_hotplug.h > @@ -20,6 +20,9 @@ typedef struct AcpiCpuHotplug { > uint8_t sts[ACPI_GPE_PROC_LEN]; > } AcpiCpuHotplug; > > +void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, > + AcpiCpuHotplug *g, DeviceState *dev, Error **errp); > + > void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu); > > void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner,
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 2ad83a0..06e9c61 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -36,6 +36,24 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = { }, }; +void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, + AcpiCpuHotplug *g, DeviceState *dev, Error **errp) +{ + CPUState *cpu = CPU(dev); + CPUClass *k = CPU_GET_CLASS(cpu); + int64_t cpu_id; + + cpu_id = k->get_arch_id(cpu); + if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) { + error_setg(errp, "acpi: invalid cpu id: %" PRIi64, cpu_id); + return; + } + + AcpiCpuHotplug_add(&ar->gpe, g, cpu); + + acpi_update_sci(ar, irq); +} + void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu) { CPUClass *k = CPU_GET_CLASS(cpu); diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 9e5d30c..5dca8d7 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -20,6 +20,9 @@ typedef struct AcpiCpuHotplug { uint8_t sts[ACPI_GPE_PROC_LEN]; } AcpiCpuHotplug; +void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, + AcpiCpuHotplug *g, DeviceState *dev, Error **errp); + void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu); void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner,
v4: -convert CPUState *cpu to DeviceState *dev like it's done for other handlers and do cast to CPU inside. v2: -add errp argument to catch error. -return error instead of aborting if cpu id is invalid. -make acpi_cpu_plug_cb as a wrapper around AcpiCpuHotplug_add. Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com> --- hw/acpi/cpu_hotplug.c | 18 ++++++++++++++++++ include/hw/acpi/cpu_hotplug.h | 3 +++ 2 files changed, 21 insertions(+), 0 deletions(-)