ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc: propagate memory hotplug event to ACPI device 

Notify PIIX4_PM/ICH9LPC device about hotplug event,
so that it would send SCI to guest notifying about
newly added memory.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2014-06-02 15:25:25 +02:00 committed by Michael S. Tsirkin
parent 781bbd6bec
commit 3fbcdc27b1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/i386/pc.c
View File

@ -1549,6 +1549,7 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
int slot; int slot;
HotplugHandlerClass *hhc;
Error *local_err = NULL; Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev); PCMachineState *pcms = PC_MACHINE(hotplug_dev);
MachineState *machine = MACHINE(hotplug_dev); MachineState *machine = MACHINE(hotplug_dev);
@ -1591,9 +1592,18 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
} }
trace_mhp_pc_dimm_assigned_slot(slot); trace_mhp_pc_dimm_assigned_slot(slot);
if (!pcms->acpi_dev) {
error_setg(&local_err,
"memory hotplug is not enabled: missing acpi device");
goto out;
}
memory_region_add_subregion(&pcms->hotplug_memory, memory_region_add_subregion(&pcms->hotplug_memory,
addr - pcms->hotplug_memory_base, mr); addr - pcms->hotplug_memory_base, mr);
vmstate_register_ram(mr, dev); vmstate_register_ram(mr, dev);
hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
out: out:
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }