"Dr. David Alan Gilbert" <dgilb...@redhat.com> wrote: > * Juan Quintela (quint...@redhat.com) wrote: >> Signed-off-by: Juan Quintela <quint...@redhat.com> >> --- >> include/migration/migration.h | 36 ----------------------------- >> include/migration/ram.h | 54 >> +++++++++++++++++++++++++++++++++++++++++++ >> migration/migration.c | 1 + >> migration/postcopy-ram.c | 1 + >> migration/ram.c | 1 + >> migration/rdma.c | 1 + >> migration/savevm.c | 1 + >> 7 files changed, 59 insertions(+), 36 deletions(-) >> create mode 100644 include/migration/ram.h >> >> diff --git a/include/migration/migration.h b/include/migration/migration.h >> index 1451067..3e5d106 100644 >> --- a/include/migration/migration.h >> +++ b/include/migration/migration.h >> @@ -192,36 +192,6 @@ bool migration_is_blocked(Error **errp); >> bool migration_in_postcopy(void); >> MigrationState *migrate_get_current(void); >> >> -void migrate_compress_threads_create(void); >> -void migrate_compress_threads_join(void); >> -void migrate_decompress_threads_create(void); >> -void migrate_decompress_threads_join(void); >> -uint64_t ram_bytes_remaining(void); >> -uint64_t ram_bytes_transferred(void); >> -uint64_t ram_bytes_total(void); >> -uint64_t ram_dirty_sync_count(void); >> -uint64_t ram_dirty_pages_rate(void); >> -uint64_t ram_postcopy_requests(void); >> -void free_xbzrle_decoded_buf(void); >> - >> -void acct_update_position(QEMUFile *f, size_t size, bool zero); >> - >> -uint64_t dup_mig_pages_transferred(void); >> -uint64_t norm_mig_pages_transferred(void); >> -uint64_t xbzrle_mig_bytes_transferred(void); >> -uint64_t xbzrle_mig_pages_transferred(void); >> -uint64_t xbzrle_mig_pages_overflow(void); >> -uint64_t xbzrle_mig_pages_cache_miss(void); >> -double xbzrle_mig_cache_miss_rate(void); >> - >> -void ram_handle_compressed(void *host, uint8_t ch, uint64_t size); >> -void ram_debug_dump_bitmap(unsigned long *todump, bool expected); >> -/* For outgoing discard bitmap */ >> -int ram_postcopy_send_discard_bitmap(MigrationState *ms); >> -/* For incoming postcopy discard */ >> -int ram_discard_range(const char *block_name, uint64_t start, size_t >> length); >> -int ram_postcopy_incoming_init(MigrationIncomingState *mis); >> -void ram_postcopy_migrated_memory_release(MigrationState *ms); >> >> bool migrate_release_ram(void); >> bool migrate_postcopy_ram(void); >> @@ -233,8 +203,6 @@ int migrate_use_xbzrle(void); >> int64_t migrate_xbzrle_cache_size(void); >> bool migrate_colo_enabled(void); >> >> -int64_t xbzrle_cache_resize(int64_t new_size); >> - >> bool migrate_use_block_enabled(void); >> bool migrate_use_block_shared(void); >> >> @@ -273,10 +241,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t >> block_offset, >> ram_addr_t offset, size_t size, >> uint64_t *bytes_sent); >> >> -void migration_page_queue_free(void); >> -int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t >> len); >> -uint64_t ram_pagesize_summary(void); >> - >> PostcopyState postcopy_state_get(void); >> /* Set the state and return the old state */ >> PostcopyState postcopy_state_set(PostcopyState new_state); >> diff --git a/include/migration/ram.h b/include/migration/ram.h >> new file mode 100644 >> index 0000000..c3653b3 >> --- /dev/null >> +++ b/include/migration/ram.h >> @@ -0,0 +1,54 @@ >> +/* >> + * QEMU migration ram >> + * >> + * Copyright IBM, Corp. 2008 >> + * >> + * Authors: >> + * Anthony Liguori <aligu...@us.ibm.com> > > Shouldn't that be updated a bit? > > Other than that,
With what? I can put myself there, but it is just copying a lot of function prototypes, i.e. not as if I had done lot of work there right now. But I am open to suggestions. > > Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > >> + * This work is licensed under the terms of the GNU GPL, version 2. See >> + * the COPYING file in the top-level directory. >> + * >> + */ >> + >> +#ifndef QEMU_MIGRATION_RAM_H >> +#define QEMU_MIGRATION_RAM_H >> + >> +#include "qemu-common.h" >> +#include "exec/cpu-common.h" >> + >> +int64_t xbzrle_cache_resize(int64_t new_size); >> +uint64_t dup_mig_pages_transferred(void); >> +uint64_t norm_mig_pages_transferred(void); >> +uint64_t xbzrle_mig_bytes_transferred(void); >> +uint64_t xbzrle_mig_pages_transferred(void); >> +uint64_t xbzrle_mig_pages_cache_miss(void); >> +double xbzrle_mig_cache_miss_rate(void); >> +uint64_t xbzrle_mig_pages_overflow(void); Will try to take a look at that, but on the other hand, I am trying to get the qmp code out of migration.c in its own file. One can't have everything. Thanks, Juan.