[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RESEND v1 Part2 11/13] pc-dimm: Add memory hot unplu
From: |
Tang Chen |
Subject: |
[Qemu-devel] [PATCH RESEND v1 Part2 11/13] pc-dimm: Add memory hot unplug support for pc-dimm. |
Date: |
Thu, 11 Dec 2014 14:19:50 +0800 |
Implement unplug cb for pc-dimm. It remove the corresponding
memory region, and unregister vmstat. At last, it calls memory
unplug cb to reset memory status and do unparenting.
---
hw/i386/pc.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index fa8bed4..688579d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1690,6 +1690,23 @@ out:
error_propagate(errp, local_err);
}
+static void pc_dimm_unplug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ PCMachineState *pcms = PC_MACHINE(hotplug_dev);
+ PCDIMMDevice *dimm = PC_DIMM(dev);
+ PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
+ MemoryRegion *mr = ddc->get_memory_region(dimm);
+ HotplugHandlerClass *hhc;
+ Error *local_err = NULL;
+
+ memory_region_del_subregion(&pcms->hotplug_memory, mr);
+ vmstate_unregister_ram(mr, dev);
+
+ hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
+ hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
+}
+
static void pc_cpu_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
@@ -1743,8 +1760,12 @@ static void
pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- error_setg(errp, "acpi: device unplug for not supported device"
- " type: %s", object_get_typename(OBJECT(dev)));
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ pc_dimm_unplug(hotplug_dev, dev, errp);
+ } else {
+ error_setg(errp, "acpi: device unplug for not supported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
--
1.8.4.2
- [Qemu-devel] [PATCH RESEND v1 Part2 01/13] acpi, mem-hotplug: Use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb()., (continued)
- [Qemu-devel] [PATCH RESEND v1 Part2 01/13] acpi, mem-hotplug: Use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb()., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 02/13] acpi, mem-hotplug: Add acpi_memory_get_slot_status_descriptor() to get MemStatus., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 03/13] acpi, mem-hotplug: Add acpi_memory_hotplug_sci() to rise sci for memory hotplug., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 04/13] acpi, mem-hotplug: Add unplug request cb for memory device., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 05/13] acpi, piix4: Add memory hot unplug request support for piix4., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 06/13] acpi, ich9: Add memory hot unplug request support for ich9., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 07/13] pc-dimm: Add memory hot unplug request support for pc-dimm., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 08/13] acpi, mem-hotplug: Add unplug cb for memory device., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 09/13] acpi, piix4: Add memory hot unplug support for piix4., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 10/13] acpi, ich9: Add memory hot unplug support for ich9., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 11/13] pc-dimm: Add memory hot unplug support for pc-dimm.,
Tang Chen <=
- [Qemu-devel] [PATCH RESEND v1 Part2 12/13] acpi: Add hardware implementation for memory hot unplug., Tang Chen, 2014/12/11
- [Qemu-devel] [PATCH RESEND v1 Part2 13/13] pc, acpi bios: Add memory hot unplug interface., Tang Chen, 2014/12/11