motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-17 23:22:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

acpi, mem-hotplug: add acpi_memory_slot_status() to get MemStatus

Browse source 
Add a new API named acpi_memory_slot_status() to obtain a single memory
slot status. Doing this is because this procedure will be used by other
functions in the next coming patches.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Tang Chen 2015-04-27 16:47:16 +08:00 • committed by Michael S. Tsirkin
parent 4fccb4834d
commit 4aae99b633
1 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
hw/acpi/memory_hotplug.c
View file

@ -163,29 +163,51 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner,
memory_region_add_subregion(as, ACPI_MEMORY_HOTPLUG_BASE, &state->io); memory_region_add_subregion(as, ACPI_MEMORY_HOTPLUG_BASE, &state->io);
} }
void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, /**
DeviceState *dev, Error **errp) * acpi_memory_slot_status:
* @mem_st: memory hotplug state
* @dev: device
* @errp: set in case of an error
*
* Obtain a single memory slot status.
*
* This function will be called by memory unplug request cb and unplug cb.
*/
static MemStatus *
acpi_memory_slot_status(MemHotplugState *mem_st,
DeviceState *dev, Error **errp)
{ {
MemStatus *mdev;
Error *local_err = NULL; Error *local_err = NULL;
int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
&local_err); &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return NULL;
} }
if (slot >= mem_st->dev_count) { if (slot >= mem_st->dev_count) {
char *dev_path = object_get_canonical_path(OBJECT(dev)); char *dev_path = object_get_canonical_path(OBJECT(dev));
error_setg(errp, "acpi_memory_plug_cb: " error_setg(errp, "acpi_memory_slot_status: "
"device [%s] returned invalid memory slot[%d]", "device [%s] returned invalid memory slot[%d]",
dev_path, slot); dev_path, slot);
g_free(dev_path); g_free(dev_path);
return NULL;
}
return &mem_st->devs[slot];
}
void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st,
DeviceState *dev, Error **errp)
{
MemStatus *mdev;
mdev = acpi_memory_slot_status(mem_st, dev, errp);
if (!mdev) {
return; return;
} }
mdev = &mem_st->devs[slot];
mdev->dimm = dev; mdev->dimm = dev;
mdev->is_enabled = true; mdev->is_enabled = true;
mdev->is_inserting = true; mdev->is_inserting = true;