mirror of https://github.com/xemu-project/xemu.git
virtio-mem: Implement replay_discarded RamDiscardManager callback
Implement it similar to the replay_populated callback. Acked-by: Peter Xu <peterx@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
adaf9d92f8
commit
372aa6fd73
|
@ -228,6 +228,38 @@ static int virtio_mem_for_each_plugged_section(const VirtIOMEM *vmem,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int virtio_mem_for_each_unplugged_section(const VirtIOMEM *vmem,
|
||||||
|
MemoryRegionSection *s,
|
||||||
|
void *arg,
|
||||||
|
virtio_mem_section_cb cb)
|
||||||
|
{
|
||||||
|
unsigned long first_bit, last_bit;
|
||||||
|
uint64_t offset, size;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
first_bit = s->offset_within_region / vmem->bitmap_size;
|
||||||
|
first_bit = find_next_zero_bit(vmem->bitmap, vmem->bitmap_size, first_bit);
|
||||||
|
while (first_bit < vmem->bitmap_size) {
|
||||||
|
MemoryRegionSection tmp = *s;
|
||||||
|
|
||||||
|
offset = first_bit * vmem->block_size;
|
||||||
|
last_bit = find_next_bit(vmem->bitmap, vmem->bitmap_size,
|
||||||
|
first_bit + 1) - 1;
|
||||||
|
size = (last_bit - first_bit + 1) * vmem->block_size;
|
||||||
|
|
||||||
|
if (!virito_mem_intersect_memory_section(&tmp, offset, size)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ret = cb(&tmp, arg);
|
||||||
|
if (ret) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
first_bit = find_next_zero_bit(vmem->bitmap, vmem->bitmap_size,
|
||||||
|
last_bit + 2);
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int virtio_mem_notify_populate_cb(MemoryRegionSection *s, void *arg)
|
static int virtio_mem_notify_populate_cb(MemoryRegionSection *s, void *arg)
|
||||||
{
|
{
|
||||||
RamDiscardListener *rdl = arg;
|
RamDiscardListener *rdl = arg;
|
||||||
|
@ -1170,6 +1202,31 @@ static int virtio_mem_rdm_replay_populated(const RamDiscardManager *rdm,
|
||||||
virtio_mem_rdm_replay_populated_cb);
|
virtio_mem_rdm_replay_populated_cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int virtio_mem_rdm_replay_discarded_cb(MemoryRegionSection *s,
|
||||||
|
void *arg)
|
||||||
|
{
|
||||||
|
struct VirtIOMEMReplayData *data = arg;
|
||||||
|
|
||||||
|
((ReplayRamDiscard)data->fn)(s, data->opaque);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void virtio_mem_rdm_replay_discarded(const RamDiscardManager *rdm,
|
||||||
|
MemoryRegionSection *s,
|
||||||
|
ReplayRamDiscard replay_fn,
|
||||||
|
void *opaque)
|
||||||
|
{
|
||||||
|
const VirtIOMEM *vmem = VIRTIO_MEM(rdm);
|
||||||
|
struct VirtIOMEMReplayData data = {
|
||||||
|
.fn = replay_fn,
|
||||||
|
.opaque = opaque,
|
||||||
|
};
|
||||||
|
|
||||||
|
g_assert(s->mr == &vmem->memdev->mr);
|
||||||
|
virtio_mem_for_each_unplugged_section(vmem, s, &data,
|
||||||
|
virtio_mem_rdm_replay_discarded_cb);
|
||||||
|
}
|
||||||
|
|
||||||
static void virtio_mem_rdm_register_listener(RamDiscardManager *rdm,
|
static void virtio_mem_rdm_register_listener(RamDiscardManager *rdm,
|
||||||
RamDiscardListener *rdl,
|
RamDiscardListener *rdl,
|
||||||
MemoryRegionSection *s)
|
MemoryRegionSection *s)
|
||||||
|
@ -1234,6 +1291,7 @@ static void virtio_mem_class_init(ObjectClass *klass, void *data)
|
||||||
rdmc->get_min_granularity = virtio_mem_rdm_get_min_granularity;
|
rdmc->get_min_granularity = virtio_mem_rdm_get_min_granularity;
|
||||||
rdmc->is_populated = virtio_mem_rdm_is_populated;
|
rdmc->is_populated = virtio_mem_rdm_is_populated;
|
||||||
rdmc->replay_populated = virtio_mem_rdm_replay_populated;
|
rdmc->replay_populated = virtio_mem_rdm_replay_populated;
|
||||||
|
rdmc->replay_discarded = virtio_mem_rdm_replay_discarded;
|
||||||
rdmc->register_listener = virtio_mem_rdm_register_listener;
|
rdmc->register_listener = virtio_mem_rdm_register_listener;
|
||||||
rdmc->unregister_listener = virtio_mem_rdm_unregister_listener;
|
rdmc->unregister_listener = virtio_mem_rdm_unregister_listener;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue