diff mbox

[05/16] migration: Add multifd capability

Message ID 20170313124434.1043-6-quintela@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Juan Quintela March 13, 2017, 12:44 p.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 include/migration/migration.h | 1 +
 migration/migration.c         | 9 +++++++++
 qapi-schema.json              | 6 ++++--
 3 files changed, 14 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/include/migration/migration.h b/include/migration/migration.h
index 5720c88..d48934b 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -323,6 +323,7 @@  bool migrate_postcopy_ram(void);
 bool migrate_zero_blocks(void);
 
 bool migrate_auto_converge(void);
+bool migrate_use_multifd(void);
 
 int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen,
                          uint8_t *dst, int dlen);
diff --git a/migration/migration.c b/migration/migration.c
index 3dab684..0e5b0bf 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1409,6 +1409,15 @@  bool migrate_use_events(void)
     return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS];
 }
 
+bool migrate_use_multifd(void)
+{
+    MigrationState *s;
+
+    s = migrate_get_current();
+
+    return s->enabled_capabilities[MIGRATION_CAPABILITY_X_MULTIFD];
+}
+
 int migrate_use_xbzrle(void)
 {
     MigrationState *s;
diff --git a/qapi-schema.json b/qapi-schema.json
index 32b4a4b..d21934b 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -868,12 +868,14 @@ 
 # @release-ram: if enabled, qemu will free the migrated ram pages on the source
 #        during postcopy-ram migration. (since 2.9)
 #
+# @x-multifd: Use more than one fd for migration (since 2.9)
+#
 # Since: 1.2
 ##
 { 'enum': 'MigrationCapability',
   'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks',
-           'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram'] }
-
+           'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram',
+           'x-multifd'] }
 ##
 # @MigrationCapabilityStatus:
 #