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

migration: pass MigrationIncomingState* into migration check functions 

That tiny refactoring is necessary to be able to set
UFFD_FEATURE_THREAD_ID while requesting features, and then
to create downtime context in case when kernel supports it.

Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Alexey Perevalov 2017-09-19 19:47:56 +03:00 committed by Juan Quintela
parent 58110f0acb
commit d7651f150d
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migration/migration.c
View File

@ -659,6 +659,7 @@ static bool migrate_caps_check(bool *cap_list,
{ {
MigrationCapabilityStatusList *cap; MigrationCapabilityStatusList *cap;
bool old_postcopy_cap; bool old_postcopy_cap;
MigrationIncomingState *mis = migration_incoming_get_current();
old_postcopy_cap = cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]; old_postcopy_cap = cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM];
@ -692,7 +693,7 @@ static bool migrate_caps_check(bool *cap_list,
* special support. * special support.
*/ */
if (!old_postcopy_cap && runstate_check(RUN_STATE_INMIGRATE) && if (!old_postcopy_cap && runstate_check(RUN_STATE_INMIGRATE) &&
!postcopy_ram_supported_by_host()) { !postcopy_ram_supported_by_host(mis)) {
/* postcopy_ram_supported_by_host will have emitted a more /* postcopy_ram_supported_by_host will have emitted a more
* detailed message * detailed message
*/ */

10
migration/postcopy-ram.c
View File

@ -61,7 +61,7 @@ struct PostcopyDiscardState {
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <linux/userfaultfd.h> #include <linux/userfaultfd.h>
static bool ufd_version_check(int ufd) static bool ufd_version_check(int ufd, MigrationIncomingState *mis)
{ {
struct uffdio_api api_struct; struct uffdio_api api_struct;
uint64_t ioctl_mask; uint64_t ioctl_mask;
@ -124,7 +124,7 @@ static int test_ramblock_postcopiable(const char *block_name, void *host_addr,
* normally fine since if the postcopy succeeds it gets turned back on at the * normally fine since if the postcopy succeeds it gets turned back on at the
* end. * end.
*/ */
bool postcopy_ram_supported_by_host(void) bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
{ {
long pagesize = getpagesize(); long pagesize = getpagesize();
int ufd = -1; int ufd = -1;
@ -147,7 +147,7 @@ bool postcopy_ram_supported_by_host(void)
} }
/* Version and features check */ /* Version and features check */
if (!ufd_version_check(ufd)) { if (!ufd_version_check(ufd, mis)) {
goto out; goto out;
} }
@ -523,7 +523,7 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis)
* Although the host check already tested the API, we need to * Although the host check already tested the API, we need to
* do the check again as an ABI handshake on the new fd. * do the check again as an ABI handshake on the new fd.
*/ */
if (!ufd_version_check(mis->userfault_fd)) { if (!ufd_version_check(mis->userfault_fd, mis)) {
return -1; return -1;
} }
@ -661,7 +661,7 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis)
#else #else
/* No target OS support, stubs just fail */ /* No target OS support, stubs just fail */
bool postcopy_ram_supported_by_host(void) bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
{ {
error_report("%s: No OS support", __func__); error_report("%s: No OS support", __func__);
return false; return false;

2
migration/postcopy-ram.h
View File

@ -14,7 +14,7 @@
#define QEMU_POSTCOPY_RAM_H #define QEMU_POSTCOPY_RAM_H
/* Return true if the host supports everything we need to do postcopy-ram */ /* Return true if the host supports everything we need to do postcopy-ram */
bool postcopy_ram_supported_by_host(void); bool postcopy_ram_supported_by_host(MigrationIncomingState *mis);
/* /*
* Make all of RAM sensitive to accesses to areas that haven't yet been written * Make all of RAM sensitive to accesses to areas that haven't yet been written

2
migration/savevm.c
View File

@ -1380,7 +1380,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis)
return 0; return 0;
} }
if (!postcopy_ram_supported_by_host()) { if (!postcopy_ram_supported_by_host(mis)) {
postcopy_state_set(POSTCOPY_INCOMING_NONE); postcopy_state_set(POSTCOPY_INCOMING_NONE);
return -1; return -1;
} }