[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/51] ram: Move xbzrle_bytes into RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 17/51] ram: Move xbzrle_bytes into RAMState |
Date: |
Thu, 23 Mar 2017 21:45:10 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 690ca8f..721fd66 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -172,6 +172,8 @@ struct RAMState {
uint64_t norm_pages;
/* Iterations since start */
uint64_t iterations;
+ /* xbzrle transmitted bytes */
+ uint64_t xbzrle_bytes;
};
typedef struct RAMState RAMState;
@@ -179,7 +181,6 @@ static RAMState ram_state;
/* accounting for migration statistics */
typedef struct AccountingInfo {
- uint64_t xbzrle_bytes;
uint64_t xbzrle_pages;
uint64_t xbzrle_cache_miss;
double xbzrle_cache_miss_rate;
@@ -205,7 +206,7 @@ uint64_t norm_mig_pages_transferred(void)
uint64_t xbzrle_mig_bytes_transferred(void)
{
- return acct_info.xbzrle_bytes;
+ return ram_state.xbzrle_bytes;
}
uint64_t xbzrle_mig_pages_transferred(void)
@@ -544,7 +545,7 @@ static int save_xbzrle_page(RAMState *rs, QEMUFile *f,
uint8_t **current_data,
qemu_put_buffer(f, XBZRLE.encoded_buf, encoded_len);
bytes_xbzrle += encoded_len + 1 + 2;
acct_info.xbzrle_pages++;
- acct_info.xbzrle_bytes += bytes_xbzrle;
+ rs->xbzrle_bytes += bytes_xbzrle;
*bytes_transferred += bytes_xbzrle;
return 1;
@@ -1995,6 +1996,7 @@ static int ram_save_init_globals(RAMState *rs)
rs->zero_pages = 0;
rs->norm_pages = 0;
rs->iterations = 0;
+ rs->xbzrle_bytes = 0;
migration_bitmap_sync_init(rs);
qemu_mutex_init(&migration_bitmap_mutex);
--
2.9.3
- Re: [Qemu-devel] [PATCH 13/51] ram: Remove unused pages_skipped variable, (continued)
- [Qemu-devel] [PATCH 12/51] ram: Remove unused dup_mig_bytes_transferred(), Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 11/51] ram: Move dup_pages into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 16/51] ram: Move iterations into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 14/51] ram: Move norm_pages to RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 15/51] ram: Remove norm_mig_bytes_transferred, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 17/51] ram: Move xbzrle_bytes into RAMState,
Juan Quintela <=
- [Qemu-devel] [PATCH 18/51] ram: Move xbzrle_pages into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 19/51] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 20/51] ram: Move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/03/23