diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-02-24 18:28:32 +0000 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-02-28 11:30:23 +0000 |
| commit | d3a5038c461b9436e5bc82a802b7a843b79f417f (patch) | |
| tree | 208a2a6f5920715f1c5fcaa2a2b0c2dd965d0914 /include | |
| parent | 29c59172015b24b442b2d85fa3b2382e262f3d74 (diff) | |
| download | focaccia-qemu-d3a5038c461b9436e5bc82a802b7a843b79f417f.tar.gz focaccia-qemu-d3a5038c461b9436e5bc82a802b7a843b79f417f.zip | |
exec: ram_block_discard_range
Create ram_block_discard_range in exec.c to replace postcopy_ram_discard_range and most of ram_discard_range. Those two routines are a bit of a weird combination, and ram_discard_range is about to get more complex for hugepages. It's OS dependent code (so shouldn't be in migration/ram.c) but it needs quite a bit of the innards of RAMBlock so doesn't belong in the os*.c. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> Message-Id: <20170224182844.32452-5-dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/cpu-common.h | 1 | ||||
| -rw-r--r-- | include/migration/postcopy-ram.h | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index bd15853e51..1350c2e441 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -105,6 +105,7 @@ typedef int (RAMBlockIterFunc)(const char *block_name, void *host_addr, ram_addr_t offset, ram_addr_t length, void *opaque); int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); +int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length); #endif diff --git a/include/migration/postcopy-ram.h b/include/migration/postcopy-ram.h index b6a7491f2d..43bbbcadc5 100644 --- a/include/migration/postcopy-ram.h +++ b/include/migration/postcopy-ram.h @@ -35,13 +35,6 @@ int postcopy_ram_incoming_init(MigrationIncomingState *mis, size_t ram_pages); int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis); /* - * Discard the contents of 'length' bytes from 'start' - * We can assume that if we've been called postcopy_ram_hosttest returned true - */ -int postcopy_ram_discard_range(MigrationIncomingState *mis, uint8_t *start, - size_t length); - -/* * Userfault requires us to mark RAM as NOHUGEPAGE prior to discard * however leaving it until after precopy means that most of the precopy * data is still THPd |