[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/12] pc-dimm: move actual plug/unplug of a memory r
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 07/12] pc-dimm: move actual plug/unplug of a memory region to MemoryDevice |
Date: |
Mon, 7 May 2018 14:03:10 -0300 |
From: David Hildenbrand <address@hidden>
Registering the memory region for migration has do be done by the owner.
There could be cases, where we don't want to migrate the memory.
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/hw/mem/memory-device.h | 3 +++
hw/mem/memory-device.c | 18 ++++++++++++++++++
hw/mem/pc-dimm.c | 5 ++---
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 3427c7d424..2853b084b5 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -44,5 +44,8 @@ uint64_t get_plugged_memory_size(void);
uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
uint64_t align, uint64_t size,
Error **errp);
+void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
+ uint64_t addr);
+void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
#endif
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 8535ddcb14..3e04f3954e 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -243,6 +243,24 @@ uint64_t get_plugged_memory_size(void)
return size;
}
+void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
+ uint64_t addr)
+{
+ /* we expect a previous call to memory_device_get_free_addr() */
+ g_assert(ms->device_memory);
+
+ memory_region_add_subregion(&ms->device_memory->mr,
+ addr - ms->device_memory->base, mr);
+}
+
+void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr)
+{
+ /* we expect a previous call to memory_device_get_free_addr() */
+ g_assert(ms->device_memory);
+
+ memory_region_del_subregion(&ms->device_memory->mr, mr);
+}
+
static const TypeInfo memory_device_info = {
.name = TYPE_MEMORY_DEVICE,
.parent = TYPE_INTERFACE,
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 8aa2d36ce9..0119c68e01 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -36,7 +36,6 @@ void pc_dimm_memory_plug(DeviceState *dev, MachineState
*machine,
uint64_t align, Error **errp)
{
int slot;
- MemoryHotplugState *hpms = machine->device_memory;
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
@@ -83,7 +82,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MachineState
*machine,
}
trace_mhp_pc_dimm_assigned_slot(slot);
- memory_region_add_subregion(&hpms->mr, addr - hpms->base, mr);
+ memory_device_plug_region(machine, mr, addr);
vmstate_register_ram(vmstate_mr, dev);
out:
@@ -97,7 +96,7 @@ void pc_dimm_memory_unplug(DeviceState *dev, MachineState
*machine)
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
- memory_region_del_subregion(&machine->device_memory->mr, mr);
+ memory_device_unplug_region(machine, mr);
vmstate_unregister_ram(vmstate_mr, dev);
}
--
2.14.3
- [Qemu-devel] [PULL 00/12] Machine queue, 2018-05-07, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 01/12] pc-dimm: factor out MemoryDevice interface, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 02/12] machine: make MemoryHotplugState accessible via the machine, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 04/12] pc-dimm: pass in the machine and to the MemoryHotplugState, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 03/12] pc-dimm: no need to pass the memory region, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 06/12] pc-dimm: factor out capacity and slot checks into MemoryDevice, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 05/12] pc-dimm: factor out address search into MemoryDevice code, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 07/12] pc-dimm: move actual plug/unplug of a memory region to MemoryDevice,
Eduardo Habkost <=
- [Qemu-devel] [PULL 08/12] machine: rename MemoryHotplugState to DeviceMemoryState, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 09/12] pc: rename "hotplug memory" terminology to "device memory", Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 10/12] spapr: rename "hotplug memory" terminology to "device memory", Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 12/12] scripts/device-crash-test: Removed fixed CAN entries, Eduardo Habkost, 2018/05/07
- [Qemu-devel] [PULL 11/12] vl: allow 'maxmem' without 'slot', Eduardo Habkost, 2018/05/07
- Re: [Qemu-devel] [PULL 00/12] Machine queue, 2018-05-07, Peter Maydell, 2018/05/08