ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: postcopy_pause_fault_thread() never fails 

Per the title, remove the return code and simplify the callers as the errors
will never be triggered.  No functional change intended.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20220301083925.33483-12-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Peter Xu 2022-03-01 16:39:11 +08:00 committed by Dr. David Alan Gilbert
parent d5c8f2afe8
commit 27dd21b461
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
migration/postcopy-ram.c
View File

@ -891,15 +891,11 @@ static void mark_postcopy_blocktime_end(uintptr_t addr)
affected_cpu); affected_cpu);
} }
static bool postcopy_pause_fault_thread(MigrationIncomingState *mis) static void postcopy_pause_fault_thread(MigrationIncomingState *mis)
{ {
trace_postcopy_pause_fault_thread(); trace_postcopy_pause_fault_thread();
qemu_sem_wait(&mis->postcopy_pause_sem_fault); qemu_sem_wait(&mis->postcopy_pause_sem_fault);
trace_postcopy_pause_fault_thread_continued(); trace_postcopy_pause_fault_thread_continued();
return true;
} }
/* /*
@ -959,13 +955,7 @@ static void *postcopy_ram_fault_thread(void *opaque)
* broken already using the event. We should hold until * broken already using the event. We should hold until
* the channel is rebuilt. * the channel is rebuilt.
*/ */
if (postcopy_pause_fault_thread(mis)) { postcopy_pause_fault_thread(mis);
/* Continue to read the userfaultfd */
} else {
error_report("%s: paused but don't allow to continue",
__func__);
break;
}
} }
if (pfd[1].revents) { if (pfd[1].revents) {
@ -1039,15 +1029,8 @@ retry:
msg.arg.pagefault.address); msg.arg.pagefault.address);
if (ret) { if (ret) {
/* May be network failure, try to wait for recovery */ /* May be network failure, try to wait for recovery */
if (postcopy_pause_fault_thread(mis)) { postcopy_pause_fault_thread(mis);
/* We got reconnected somehow, try to continue */ goto retry;
goto retry;
} else {
/* This is a unavoidable fault */
error_report("%s: postcopy_request_page() get %d",
__func__, ret);
break;
}
} }
} }