falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: provide postcopy_fault_thread_notify() 

A general helper to notify the fault thread.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180208103132.28452-4-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Peter Xu 2018-02-08 18:31:07 +08:00 committed by Dr. David Alan Gilbert
parent 64f615fe34
commit 9ab7ef9b66
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
migration/postcopy-ram.c
View File

@ -377,25 +377,15 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis)
trace_postcopy_ram_incoming_cleanup_entry(); trace_postcopy_ram_incoming_cleanup_entry();
if (mis->have_fault_thread) { if (mis->have_fault_thread) {
uint64_t tmp64;
if (qemu_ram_foreach_block(cleanup_range, mis)) { if (qemu_ram_foreach_block(cleanup_range, mis)) {
return -1; return -1;
} }
/* /* Let the fault thread quit */
* Tell the fault_thread to exit, it's an eventfd that should
* currently be at 0, we're going to increment it to 1
*/
tmp64 = 1;
atomic_set(&mis->fault_thread_quit, 1); atomic_set(&mis->fault_thread_quit, 1);
if (write(mis->userfault_event_fd, &tmp64, 8) == 8) { postcopy_fault_thread_notify(mis);
trace_postcopy_ram_incoming_cleanup_join(); trace_postcopy_ram_incoming_cleanup_join();
qemu_thread_join(&mis->fault_thread); qemu_thread_join(&mis->fault_thread);
} else {
/* Not much we can do here, but may as well report it */
error_report("%s: incrementing userfault_event_fd: %s", __func__,
strerror(errno));
}
trace_postcopy_ram_incoming_cleanup_closeuf(); trace_postcopy_ram_incoming_cleanup_closeuf();
close(mis->userfault_fd); close(mis->userfault_fd);
close(mis->userfault_event_fd); close(mis->userfault_event_fd);
@ -824,6 +814,21 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
void postcopy_fault_thread_notify(MigrationIncomingState *mis)
{
uint64_t tmp64 = 1;
/*
* Wakeup the fault_thread. It's an eventfd that should currently
* be at 0, we're going to increment it to 1
*/
if (write(mis->userfault_event_fd, &tmp64, 8) != 8) {
/* Not much we can do here, but may as well report it */
error_report("%s: incrementing failed: %s", __func__,
strerror(errno));
}
}
/** /**
* postcopy_discard_send_init: Called at the start of each RAMBlock before * postcopy_discard_send_init: Called at the start of each RAMBlock before
* asking to discard individual ranges. * asking to discard individual ranges.

2
migration/postcopy-ram.h
View File

@ -114,4 +114,6 @@ PostcopyState postcopy_state_get(void);
/* Set the state and return the old state */ /* Set the state and return the old state */
PostcopyState postcopy_state_set(PostcopyState new_state); PostcopyState postcopy_state_set(PostcopyState new_state);
void postcopy_fault_thread_notify(MigrationIncomingState *mis);
#endif #endif