diff options
| author | David Hildenbrand <david@redhat.com> | 2018-04-23 18:51:19 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-05-07 10:00:02 -0300 |
| commit | bd6c3e4a4975ee1e5cadbc1826af9bd0ca0954c2 (patch) | |
| tree | 4eb408b4c4f9303ec23b14b9aff2059581beb9dc /hw/mem | |
| parent | acc7fa17e6fe96bd68ad9af04fde5091383ef25e (diff) | |
pc-dimm: pass in the machine and to the MemoryHotplugState
We use the machine internally either way, so let's just pass it in then.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180423165126.15441-5-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/mem')
| -rw-r--r-- | hw/mem/pc-dimm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index aeff369f6f..37b8be80a1 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -36,11 +36,11 @@ typedef struct pc_dimms_capacity { Error **errp; } pc_dimms_capacity; -void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, +void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, uint64_t align, Error **errp) { int slot; - MachineState *machine = MACHINE(qdev_get_machine()); + 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); @@ -122,14 +122,14 @@ out: error_propagate(errp, local_err); } -void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms) +void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine) { PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm); MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort); - memory_region_del_subregion(&hpms->mr, mr); + memory_region_del_subregion(&machine->device_memory->mr, mr); vmstate_unregister_ram(vmstate_mr, dev); } |