Message ID | 1420679180-14883-4-git-send-email-tangchen@cn.fujitsu.com |
---|---|
State | New |
Headers | show |
On Thu, 8 Jan 2015 09:06:10 +0800 Tang Chen <tangchen@cn.fujitsu.com> wrote: > Add a new API named acpi_memory_hotplug_sci() to send memory hotplug SCI. > Doing this is because this procedure will be used by other functions in the > next coming patches. > > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> > --- > hw/acpi/memory_hotplug.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index ef56bf6..9839963 100644 > --- a/hw/acpi/memory_hotplug.c > +++ b/hw/acpi/memory_hotplug.c > @@ -188,6 +188,12 @@ acpi_memory_get_slot_status_descriptor(MemHotplugState *mem_st, > return &mem_st->devs[slot]; > } > > +static void acpi_memory_hotplug_sci(ACPIREGS *ar, qemu_irq irq) > +{ > + ar->gpe.sts[0] |= ACPI_MEMORY_HOTPLUG_STATUS; > + acpi_update_sci(ar, irq); > +} I'd suggest do a generic: acpi_send_gpe_event(ar, irq, ACPI_MEMORY_HOTPLUG_STATUS) which could be reused by CPU and PCI hotplug as well > void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > DeviceState *dev, Error **errp) > { > @@ -201,10 +207,8 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > mdev->is_enabled = true; > mdev->is_inserting = true; > > - /* do ACPI magic */ > - ar->gpe.sts[0] |= ACPI_MEMORY_HOTPLUG_STATUS; > - acpi_update_sci(ar, irq); > - return; > + /* Do ACPI magic */ > + acpi_memory_hotplug_sci(ar, irq); > } > > static const VMStateDescription vmstate_memhp_sts = {
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index ef56bf6..9839963 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -188,6 +188,12 @@ acpi_memory_get_slot_status_descriptor(MemHotplugState *mem_st, return &mem_st->devs[slot]; } +static void acpi_memory_hotplug_sci(ACPIREGS *ar, qemu_irq irq) +{ + ar->gpe.sts[0] |= ACPI_MEMORY_HOTPLUG_STATUS; + acpi_update_sci(ar, irq); +} + void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, DeviceState *dev, Error **errp) { @@ -201,10 +207,8 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, mdev->is_enabled = true; mdev->is_inserting = true; - /* do ACPI magic */ - ar->gpe.sts[0] |= ACPI_MEMORY_HOTPLUG_STATUS; - acpi_update_sci(ar, irq); - return; + /* Do ACPI magic */ + acpi_memory_hotplug_sci(ar, irq); } static const VMStateDescription vmstate_memhp_sts = {
Add a new API named acpi_memory_hotplug_sci() to send memory hotplug SCI. Doing this is because this procedure will be used by other functions in the next coming patches. Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> --- hw/acpi/memory_hotplug.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)