mirror of
https://github.com/qemu/qemu.git
synced 2024-11-26 21:33:40 +08:00
ram: Use the RAMState bytes_transferred parameter
Somewhere it was passed by reference, just use it from RAMState. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela
parent
2f4fde9352
commit
072c251157
@ -495,12 +495,10 @@ static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr)
|
||||
* @block: block that contains the page we want to send
|
||||
* @offset: offset inside the block for the page
|
||||
* @last_stage: if we are at the completion stage
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
*/
|
||||
static int save_xbzrle_page(RAMState *rs, QEMUFile *f, uint8_t **current_data,
|
||||
ram_addr_t current_addr, RAMBlock *block,
|
||||
ram_addr_t offset, bool last_stage,
|
||||
uint64_t *bytes_transferred)
|
||||
ram_addr_t offset, bool last_stage)
|
||||
{
|
||||
int encoded_len = 0, bytes_xbzrle;
|
||||
uint8_t *prev_cached_page;
|
||||
@ -556,7 +554,7 @@ static int save_xbzrle_page(RAMState *rs, QEMUFile *f, uint8_t **current_data,
|
||||
bytes_xbzrle += encoded_len + 1 + 2;
|
||||
rs->xbzrle_pages++;
|
||||
rs->xbzrle_bytes += bytes_xbzrle;
|
||||
*bytes_transferred += bytes_xbzrle;
|
||||
rs->bytes_transferred += bytes_xbzrle;
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -728,20 +726,18 @@ static void migration_bitmap_sync(RAMState *rs)
|
||||
* @block: block that contains the page we want to send
|
||||
* @offset: offset inside the block for the page
|
||||
* @p: pointer to the page
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
*/
|
||||
static int save_zero_page(RAMState *rs, QEMUFile *f, RAMBlock *block,
|
||||
ram_addr_t offset,
|
||||
uint8_t *p, uint64_t *bytes_transferred)
|
||||
ram_addr_t offset, uint8_t *p)
|
||||
{
|
||||
int pages = -1;
|
||||
|
||||
if (is_zero_range(p, TARGET_PAGE_SIZE)) {
|
||||
rs->zero_pages++;
|
||||
*bytes_transferred += save_page_header(f, block,
|
||||
offset | RAM_SAVE_FLAG_COMPRESS);
|
||||
rs->bytes_transferred +=
|
||||
save_page_header(f, block, offset | RAM_SAVE_FLAG_COMPRESS);
|
||||
qemu_put_byte(f, 0);
|
||||
*bytes_transferred += 1;
|
||||
rs->bytes_transferred += 1;
|
||||
pages = 1;
|
||||
}
|
||||
|
||||
@ -772,11 +768,9 @@ static void ram_release_pages(MigrationState *ms, const char *rbname,
|
||||
* @block: block that contains the page we want to send
|
||||
* @offset: offset inside the block for the page
|
||||
* @last_stage: if we are at the completion stage
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
*/
|
||||
static int ram_save_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
PageSearchStatus *pss, bool last_stage,
|
||||
uint64_t *bytes_transferred)
|
||||
PageSearchStatus *pss, bool last_stage)
|
||||
{
|
||||
int pages = -1;
|
||||
uint64_t bytes_xmit;
|
||||
@ -794,7 +788,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
ret = ram_control_save_page(f, block->offset,
|
||||
offset, TARGET_PAGE_SIZE, &bytes_xmit);
|
||||
if (bytes_xmit) {
|
||||
*bytes_transferred += bytes_xmit;
|
||||
rs->bytes_transferred += bytes_xmit;
|
||||
pages = 1;
|
||||
}
|
||||
|
||||
@ -814,7 +808,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
pages = save_zero_page(rs, f, block, offset, p, bytes_transferred);
|
||||
pages = save_zero_page(rs, f, block, offset, p);
|
||||
if (pages > 0) {
|
||||
/* Must let xbzrle know, otherwise a previous (now 0'd) cached
|
||||
* page would be stale
|
||||
@ -824,7 +818,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
} else if (!rs->ram_bulk_stage &&
|
||||
!migration_in_postcopy(ms) && migrate_use_xbzrle()) {
|
||||
pages = save_xbzrle_page(rs, f, &p, current_addr, block,
|
||||
offset, last_stage, bytes_transferred);
|
||||
offset, last_stage);
|
||||
if (!last_stage) {
|
||||
/* Can't send this cached data async, since the cache page
|
||||
* might get updated before it gets to the wire
|
||||
@ -836,7 +830,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
|
||||
/* XBZRLE overflow or normal page */
|
||||
if (pages == -1) {
|
||||
*bytes_transferred += save_page_header(f, block,
|
||||
rs->bytes_transferred += save_page_header(f, block,
|
||||
offset | RAM_SAVE_FLAG_PAGE);
|
||||
if (send_async) {
|
||||
qemu_put_buffer_async(f, p, TARGET_PAGE_SIZE,
|
||||
@ -845,7 +839,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
} else {
|
||||
qemu_put_buffer(f, p, TARGET_PAGE_SIZE);
|
||||
}
|
||||
*bytes_transferred += TARGET_PAGE_SIZE;
|
||||
rs->bytes_transferred += TARGET_PAGE_SIZE;
|
||||
pages = 1;
|
||||
rs->norm_pages++;
|
||||
}
|
||||
@ -913,8 +907,7 @@ static inline void set_compress_params(CompressParam *param, RAMBlock *block,
|
||||
}
|
||||
|
||||
static int compress_page_with_multi_thread(RAMState *rs, QEMUFile *f,
|
||||
RAMBlock *block, ram_addr_t offset,
|
||||
uint64_t *bytes_transferred)
|
||||
RAMBlock *block, ram_addr_t offset)
|
||||
{
|
||||
int idx, thread_count, bytes_xmit = -1, pages = -1;
|
||||
|
||||
@ -931,7 +924,7 @@ static int compress_page_with_multi_thread(RAMState *rs, QEMUFile *f,
|
||||
qemu_mutex_unlock(&comp_param[idx].mutex);
|
||||
pages = 1;
|
||||
rs->norm_pages++;
|
||||
*bytes_transferred += bytes_xmit;
|
||||
rs->bytes_transferred += bytes_xmit;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -957,12 +950,10 @@ static int compress_page_with_multi_thread(RAMState *rs, QEMUFile *f,
|
||||
* @block: block that contains the page we want to send
|
||||
* @offset: offset inside the block for the page
|
||||
* @last_stage: if we are at the completion stage
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
*/
|
||||
static int ram_save_compressed_page(RAMState *rs, MigrationState *ms,
|
||||
QEMUFile *f,
|
||||
PageSearchStatus *pss, bool last_stage,
|
||||
uint64_t *bytes_transferred)
|
||||
PageSearchStatus *pss, bool last_stage)
|
||||
{
|
||||
int pages = -1;
|
||||
uint64_t bytes_xmit = 0;
|
||||
@ -976,7 +967,7 @@ static int ram_save_compressed_page(RAMState *rs, MigrationState *ms,
|
||||
ret = ram_control_save_page(f, block->offset,
|
||||
offset, TARGET_PAGE_SIZE, &bytes_xmit);
|
||||
if (bytes_xmit) {
|
||||
*bytes_transferred += bytes_xmit;
|
||||
rs->bytes_transferred += bytes_xmit;
|
||||
pages = 1;
|
||||
}
|
||||
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
|
||||
@ -996,7 +987,7 @@ static int ram_save_compressed_page(RAMState *rs, MigrationState *ms,
|
||||
*/
|
||||
if (block != rs->last_sent_block) {
|
||||
flush_compressed_data(rs, f);
|
||||
pages = save_zero_page(rs, f, block, offset, p, bytes_transferred);
|
||||
pages = save_zero_page(rs, f, block, offset, p);
|
||||
if (pages == -1) {
|
||||
/* Make sure the first page is sent out before other pages */
|
||||
bytes_xmit = save_page_header(f, block, offset |
|
||||
@ -1004,7 +995,7 @@ static int ram_save_compressed_page(RAMState *rs, MigrationState *ms,
|
||||
blen = qemu_put_compression_data(f, p, TARGET_PAGE_SIZE,
|
||||
migrate_compress_level());
|
||||
if (blen > 0) {
|
||||
*bytes_transferred += bytes_xmit + blen;
|
||||
rs->bytes_transferred += bytes_xmit + blen;
|
||||
rs->norm_pages++;
|
||||
pages = 1;
|
||||
} else {
|
||||
@ -1017,10 +1008,9 @@ static int ram_save_compressed_page(RAMState *rs, MigrationState *ms,
|
||||
}
|
||||
} else {
|
||||
offset |= RAM_SAVE_FLAG_CONTINUE;
|
||||
pages = save_zero_page(rs, f, block, offset, p, bytes_transferred);
|
||||
pages = save_zero_page(rs, f, block, offset, p);
|
||||
if (pages == -1) {
|
||||
pages = compress_page_with_multi_thread(rs, f, block, offset,
|
||||
bytes_transferred);
|
||||
pages = compress_page_with_multi_thread(rs, f, block, offset);
|
||||
} else {
|
||||
ram_release_pages(ms, block->idstr, pss->offset, pages);
|
||||
}
|
||||
@ -1298,13 +1288,11 @@ err:
|
||||
* @f: QEMUFile where to send the data
|
||||
* @pss: data about the page we want to send
|
||||
* @last_stage: if we are at the completion stage
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
* @dirty_ram_abs: address of the start of the dirty page in ram_addr_t space
|
||||
*/
|
||||
static int ram_save_target_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
PageSearchStatus *pss,
|
||||
bool last_stage,
|
||||
uint64_t *bytes_transferred,
|
||||
ram_addr_t dirty_ram_abs)
|
||||
{
|
||||
int res = 0;
|
||||
@ -1313,12 +1301,9 @@ static int ram_save_target_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
if (migration_bitmap_clear_dirty(rs, dirty_ram_abs)) {
|
||||
unsigned long *unsentmap;
|
||||
if (compression_switch && migrate_use_compression()) {
|
||||
res = ram_save_compressed_page(rs, ms, f, pss,
|
||||
last_stage,
|
||||
bytes_transferred);
|
||||
res = ram_save_compressed_page(rs, ms, f, pss, last_stage);
|
||||
} else {
|
||||
res = ram_save_page(rs, ms, f, pss, last_stage,
|
||||
bytes_transferred);
|
||||
res = ram_save_page(rs, ms, f, pss, last_stage);
|
||||
}
|
||||
|
||||
if (res < 0) {
|
||||
@ -1356,13 +1341,11 @@ static int ram_save_target_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
* @f: QEMUFile where to send the data
|
||||
* @pss: data about the page we want to send
|
||||
* @last_stage: if we are at the completion stage
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
* @dirty_ram_abs: Address of the start of the dirty page in ram_addr_t space
|
||||
*/
|
||||
static int ram_save_host_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
PageSearchStatus *pss,
|
||||
bool last_stage,
|
||||
uint64_t *bytes_transferred,
|
||||
ram_addr_t dirty_ram_abs)
|
||||
{
|
||||
int tmppages, pages = 0;
|
||||
@ -1370,7 +1353,7 @@ static int ram_save_host_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
|
||||
do {
|
||||
tmppages = ram_save_target_page(rs, ms, f, pss, last_stage,
|
||||
bytes_transferred, dirty_ram_abs);
|
||||
dirty_ram_abs);
|
||||
if (tmppages < 0) {
|
||||
return tmppages;
|
||||
}
|
||||
@ -1395,14 +1378,12 @@ static int ram_save_host_page(RAMState *rs, MigrationState *ms, QEMUFile *f,
|
||||
* @rs: current RAM state
|
||||
* @f: QEMUFile where to send the data
|
||||
* @last_stage: if we are at the completion stage
|
||||
* @bytes_transferred: increase it with the number of transferred bytes
|
||||
*
|
||||
* On systems where host-page-size > target-page-size it will send all the
|
||||
* pages in a host page that are dirty.
|
||||
*/
|
||||
|
||||
static int ram_find_and_save_block(RAMState *rs, QEMUFile *f, bool last_stage,
|
||||
uint64_t *bytes_transferred)
|
||||
static int ram_find_and_save_block(RAMState *rs, QEMUFile *f, bool last_stage)
|
||||
{
|
||||
PageSearchStatus pss;
|
||||
MigrationState *ms = migrate_get_current();
|
||||
@ -1434,8 +1415,7 @@ static int ram_find_and_save_block(RAMState *rs, QEMUFile *f, bool last_stage,
|
||||
}
|
||||
|
||||
if (found) {
|
||||
pages = ram_save_host_page(rs, ms, f, &pss,
|
||||
last_stage, bytes_transferred,
|
||||
pages = ram_save_host_page(rs, ms, f, &pss, last_stage,
|
||||
dirty_ram_abs);
|
||||
}
|
||||
} while (!pages && again);
|
||||
@ -2138,7 +2118,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
|
||||
while ((ret = qemu_file_rate_limit(f)) == 0) {
|
||||
int pages;
|
||||
|
||||
pages = ram_find_and_save_block(rs, f, false, &rs->bytes_transferred);
|
||||
pages = ram_find_and_save_block(rs, f, false);
|
||||
/* no more pages to sent */
|
||||
if (pages == 0) {
|
||||
done = 1;
|
||||
@ -2208,8 +2188,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
|
||||
while (true) {
|
||||
int pages;
|
||||
|
||||
pages = ram_find_and_save_block(rs, f, !migration_in_colo_state(),
|
||||
&rs->bytes_transferred);
|
||||
pages = ram_find_and_save_block(rs, f, !migration_in_colo_state());
|
||||
/* no more blocks to sent */
|
||||
if (pages == 0) {
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user