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

migration: handle the error condition properly 

ram_find_and_save_block() can return negative if any error hanppens,
however, it is completely ignored in current code

Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20180903092644.25812-5-xiaoguangrong@tencent.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Xiao Guangrong 2018-09-03 17:26:44 +08:00 committed by Dr. David Alan Gilbert
parent be8b02edae
commit e8f3735fa3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
migration/ram.c
View File

@ -2372,7 +2372,8 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss,
*
* Called within an RCU critical section.
*
* Returns the number of pages written where zero means no dirty pages
* Returns the number of pages written where zero means no dirty pages,
* or negative on error
*
* @rs: current RAM state
* @last_stage: if we are at the completion stage
@ -3196,6 +3197,12 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
done = 1;
break;
}
if (pages < 0) {
qemu_file_set_error(f, pages);
break;
}
rs->target_page_count += pages;
/* we want to check in the 1st loop, just in case it was the 1st time
@ -3238,7 +3245,7 @@ out:
/**
* ram_save_complete: function called to send the remaining amount of ram
*
* Returns zero to indicate success
* Returns zero to indicate success or negative on error
*
* Called with iothread lock
*
@ -3249,6 +3256,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
{
RAMState **temp = opaque;
RAMState *rs = *temp;
int ret = 0;
rcu_read_lock();
@ -3269,6 +3277,10 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
if (pages == 0) {
break;
}
if (pages < 0) {
ret = pages;
break;
}
}
flush_compressed_data(rs);
@ -3280,7 +3292,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
return 0;
return ret;
}
static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,