openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ram: We don't need MigrationState parameter anymore 

Remove it from callers and callees.

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 2017-03-20 22:29:07 +01:00
parent 5727309d25
commit a0a8aa147a
1 changed files with 10 additions and 17 deletions
migration
ram.c

27
migration/ram.c
View File

@ -794,13 +794,11 @@ static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
* if xbzrle noticed the page was the same. * if xbzrle noticed the page was the same.
* *
* @rs: current RAM state * @rs: current RAM state
* @ms: current migration state
* @block: block that contains the page we want to send * @block: block that contains the page we want to send
* @offset: offset inside the block for the page * @offset: offset inside the block for the page
* @last_stage: if we are at the completion stage * @last_stage: if we are at the completion stage
*/ */
static int ram_save_page(RAMState *rs, MigrationState *ms, static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_stage)
PageSearchStatus *pss, bool last_stage)
{ {
int pages = -1; int pages = -1;
uint64_t bytes_xmit; uint64_t bytes_xmit;
@ -974,13 +972,12 @@ static int compress_page_with_multi_thread(RAMState *rs, RAMBlock *block,
* Returns the number of pages written. * Returns the number of pages written.
* *
* @rs: current RAM state * @rs: current RAM state
* @ms: current migration state
* @block: block that contains the page we want to send * @block: block that contains the page we want to send
* @offset: offset inside the block for the page * @offset: offset inside the block for the page
* @last_stage: if we are at the completion stage * @last_stage: if we are at the completion stage
*/ */
static int ram_save_compressed_page(RAMState *rs, MigrationState *ms, static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
PageSearchStatus *pss, bool last_stage) bool last_stage)
{ {
int pages = -1; int pages = -1;
uint64_t bytes_xmit = 0; uint64_t bytes_xmit = 0;
@ -1311,10 +1308,8 @@ err:
* @last_stage: if we are at the completion stage * @last_stage: if we are at the completion stage
* @dirty_ram_abs: address of the start of the dirty page in ram_addr_t space * @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, static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
PageSearchStatus *pss, bool last_stage, ram_addr_t dirty_ram_abs)
bool last_stage,
ram_addr_t dirty_ram_abs)
{ {
int res = 0; int res = 0;
@ -1329,9 +1324,9 @@ static int ram_save_target_page(RAMState *rs, MigrationState *ms,
if (migrate_use_compression() if (migrate_use_compression()
&& (rs->ram_bulk_stage || !migrate_use_xbzrle())) { && (rs->ram_bulk_stage || !migrate_use_xbzrle())) {
res = ram_save_compressed_page(rs, ms, pss, last_stage); res = ram_save_compressed_page(rs, pss, last_stage);
} else { } else {
res = ram_save_page(rs, ms, pss, last_stage); res = ram_save_page(rs, pss, last_stage);
} }
if (res < 0) { if (res < 0) {
@ -1370,8 +1365,7 @@ static int ram_save_target_page(RAMState *rs, MigrationState *ms,
* @last_stage: if we are at the completion stage * @last_stage: if we are at the completion stage
* @dirty_ram_abs: Address of the start of the dirty page in ram_addr_t space * @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, static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss,
PageSearchStatus *pss,
bool last_stage, bool last_stage,
ram_addr_t dirty_ram_abs) ram_addr_t dirty_ram_abs)
{ {
@ -1379,7 +1373,7 @@ static int ram_save_host_page(RAMState *rs, MigrationState *ms,
size_t pagesize = qemu_ram_pagesize(pss->block); size_t pagesize = qemu_ram_pagesize(pss->block);
do { do {
tmppages = ram_save_target_page(rs, ms, pss, last_stage, dirty_ram_abs); tmppages = ram_save_target_page(rs, pss, last_stage, dirty_ram_abs);
if (tmppages < 0) { if (tmppages < 0) {
return tmppages; return tmppages;
} }
@ -1411,7 +1405,6 @@ static int ram_save_host_page(RAMState *rs, MigrationState *ms,
static int ram_find_and_save_block(RAMState *rs, bool last_stage) static int ram_find_and_save_block(RAMState *rs, bool last_stage)
{ {
PageSearchStatus pss; PageSearchStatus pss;
MigrationState *ms = migrate_get_current();
int pages = 0; int pages = 0;
bool again, found; bool again, found;
ram_addr_t dirty_ram_abs; /* Address of the start of the dirty page in ram_addr_t dirty_ram_abs; /* Address of the start of the dirty page in
@ -1440,7 +1433,7 @@ static int ram_find_and_save_block(RAMState *rs, bool last_stage)
} }
if (found) { if (found) {
pages = ram_save_host_page(rs, ms, &pss, last_stage, dirty_ram_abs); pages = ram_save_host_page(rs, &pss, last_stage, dirty_ram_abs);
} }
} while (!pages && again); } while (!pages && again);