[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/16] migration: pass MigrationIncomingState* into m
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 13/16] migration: pass MigrationIncomingState* into migration check functions |
Date: |
Wed, 20 Sep 2017 12:46:36 +0200 |
From: Alexey Perevalov <address@hidden>
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 <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 3 ++-
migration/postcopy-ram.c | 10 +++++-----
migration/postcopy-ram.h | 2 +-
migration/savevm.c | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 067dd929c4..b9056ccbac 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -659,6 +659,7 @@ static bool migrate_caps_check(bool *cap_list,
{
MigrationCapabilityStatusList *cap;
bool old_postcopy_cap;
+ MigrationIncomingState *mis = migration_incoming_get_current();
old_postcopy_cap = cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM];
@@ -692,7 +693,7 @@ static bool migrate_caps_check(bool *cap_list,
* special support.
*/
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
* detailed message
*/
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 7e21e6fd36..c70305ccc7 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -61,7 +61,7 @@ struct PostcopyDiscardState {
#include <sys/eventfd.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;
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
* end.
*/
-bool postcopy_ram_supported_by_host(void)
+bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
{
long pagesize = getpagesize();
int ufd = -1;
@@ -147,7 +147,7 @@ bool postcopy_ram_supported_by_host(void)
}
/* Version and features check */
- if (!ufd_version_check(ufd)) {
+ if (!ufd_version_check(ufd, mis)) {
goto out;
}
@@ -523,7 +523,7 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis)
* Although the host check already tested the API, we need to
* 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;
}
@@ -661,7 +661,7 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis)
#else
/* 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__);
return false;
diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h
index 52d51e8007..587a8b86a7 100644
--- a/migration/postcopy-ram.h
+++ b/migration/postcopy-ram.h
@@ -14,7 +14,7 @@
#define QEMU_POSTCOPY_RAM_H
/* 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
diff --git a/migration/savevm.c b/migration/savevm.c
index 7a55023d1a..6ed6d5765a 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1352,7 +1352,7 @@ static int
loadvm_postcopy_handle_advise(MigrationIncomingState *mis)
return -1;
}
- if (!postcopy_ram_supported_by_host()) {
+ if (!postcopy_ram_supported_by_host(mis)) {
postcopy_state_set(POSTCOPY_INCOMING_NONE);
return -1;
}
--
2.13.5
- [Qemu-devel] [PULL 00/16] Migration PULL request, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 02/16] migration: Teach it about G_SOURCE_REMOVE, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 04/16] migration: Create migration_has_all_channels, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 12/16] bitmap: provide to_le/from_le helpers, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 09/16] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 10/16] bitmap: remove BITOP_WORD(), Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 13/16] migration: pass MigrationIncomingState* into migration check functions,
Juan Quintela <=
- [Qemu-devel] [PULL 03/16] migration: Add comments to channel functions, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 05/16] migration: Add multifd capability, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 06/16] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 08/16] migration: Create multifd migration threads, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 01/16] migration: Create migration_ioc_process_incoming(), Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 14/16] migration: fix hardcoded function name in error report, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 07/16] migration: Create x-multifd-page-count parameter, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 16/16] migration: introduce postcopy-blocktime capability, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 15/16] migration: split ufd_version_check onto receive/request features part, Juan Quintela, 2017/09/20