OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ram: Create ram_dirty_sync_count()

Browse Source 
This is a ram field that was inside MigrationState.  Move it to
RAMState and make it the same that the other ram stats.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela 2017-03-14 18:01:38 +01:00
parent ec481c6c57
commit 42d219d3b0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/migration/migration.h
View File

@ -159,7 +159,6 @@ struct MigrationState
bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];
int64_t xbzrle_cache_size;
int64_t setup_time;
int64_t dirty_sync_count;
/* Count of requests incoming from destination */
int64_t postcopy_requests;
@ -255,6 +254,7 @@ 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);
void free_xbzrle_decoded_buf(void);
void acct_update_position(QEMUFile *f, size_t size, bool zero);

3
migration/migration.c
View File

@ -656,7 +656,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
info->ram->normal_bytes = norm_mig_pages_transferred() *
(1ul << qemu_target_page_bits());
info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = s->dirty_sync_count;
info->ram->dirty_sync_count = ram_dirty_sync_count();
info->ram->postcopy_requests = s->postcopy_requests;
if (s->state != MIGRATION_STATUS_COMPLETED) {
@ -1120,7 +1120,6 @@ MigrationState *migrate_init(const MigrationParams *params)
s->dirty_pages_rate = 0;
s->dirty_bytes_rate = 0;
s->setup_time = 0;
s->dirty_sync_count = 0;
s->start_postcopy = false;
s->postcopy_after_devices = false;
s->postcopy_requests = 0;

6
migration/ram.c
View File

@ -271,6 +271,11 @@ uint64_t ram_bytes_remaining(void)
return ram_state.migration_dirty_pages * TARGET_PAGE_SIZE;
}
uint64_t ram_dirty_sync_count(void)
{
return ram_state.bitmap_sync_count;
}
/* used by the search for pages to send */
struct PageSearchStatus {
/* Current block being searched */
@ -727,7 +732,6 @@ static void migration_bitmap_sync(RAMState *rs)
rs->time_last_bitmap_sync = end_time;
rs->num_dirty_pages_period = 0;
}
s->dirty_sync_count = rs->bitmap_sync_count;
if (migrate_use_events()) {
qapi_event_send_migration_pass(rs->bitmap_sync_count, NULL);
}