[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] migration: Create block capabilities for shared
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 4/5] migration: Create block capabilities for shared and enable |
Date: |
Fri, 12 May 2017 17:52:48 +0200 |
Those two capabilities were added through the command line. Notice that
we just created them. This is just the boilerplate.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: zhanghailiang <address@hidden>
---
include/migration/block.h | 3 +++
include/migration/migration.h | 3 +++
migration/migration.c | 36 ++++++++++++++++++++++++++++++++++++
qapi-schema.json | 7 ++++++-
4 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/include/migration/block.h b/include/migration/block.h
index 41a1ac8..5b3f1a5 100644
--- a/include/migration/block.h
+++ b/include/migration/block.h
@@ -20,4 +20,7 @@ uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void);
uint64_t blk_mig_bytes_total(void);
+void migrate_set_block_shared(MigrationState *s, bool value);
+void migrate_set_block_enabled(MigrationState *s, bool value);
+
#endif /* MIGRATION_BLOCK_H */
diff --git a/include/migration/migration.h b/include/migration/migration.h
index e29cb01..465d8ce 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -311,6 +311,9 @@ bool migrate_colo_enabled(void);
int64_t xbzrle_cache_resize(int64_t new_size);
+bool migrate_use_block_enabled(void);
+bool migrate_use_block_shared(void);
+
bool migrate_use_compression(void);
int migrate_compress_level(void);
int migrate_compress_threads(void);
diff --git a/migration/migration.c b/migration/migration.c
index 799952c..250e3e3 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1210,6 +1210,16 @@ bool migration_is_blocked(Error **errp)
return false;
}
+void migrate_set_block_shared(MigrationState *s, bool value)
+{
+ s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK_SHARED] = value;
+}
+
+void migrate_set_block_enabled(MigrationState *s, bool value)
+{
+ s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK_ENABLED] = value;
+}
+
void qmp_migrate(const char *uri, bool has_blk, bool blk,
bool has_inc, bool inc, bool has_detach, bool detach,
Error **errp)
@@ -1239,6 +1249,14 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
s = migrate_init(¶ms);
+ if (has_blk && blk) {
+ migrate_set_block_enabled(s, true);
+ }
+
+ if (has_inc && inc) {
+ migrate_set_block_shared(s, true);
+ }
+
if (strstart(uri, "tcp:", &p)) {
tcp_start_outgoing_migration(s, p, &local_err);
#ifdef CONFIG_RDMA
@@ -1434,6 +1452,24 @@ int64_t migrate_xbzrle_cache_size(void)
return s->xbzrle_cache_size;
}
+bool migrate_use_block_enabled(void)
+{
+ MigrationState *s;
+
+ s = migrate_get_current();
+
+ return s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK_ENABLED];
+}
+
+bool migrate_use_block_shared(void)
+{
+ MigrationState *s;
+
+ s = migrate_get_current();
+
+ return s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK_SHARED];
+}
+
/* migration thread support */
/*
* Something bad happened to the RP stream, mark an error
diff --git a/qapi-schema.json b/qapi-schema.json
index 5728b7f..109852e 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -894,11 +894,16 @@
# @release-ram: if enabled, qemu will free the migrated ram pages on the source
# during postcopy-ram migration. (since 2.9)
#
+# @block-enabled: enable block migration (Since 2.10)
+#
+# @block-shared: enable block shared migration (Since 2.10)
+#
# 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',
+ 'block-enabled', 'block-shared' ] }
##
# @MigrationCapabilityStatus:
--
2.9.3
- [Qemu-devel] [PULL 0/5] Migration pull request, Juan Quintela, 2017/05/12
- [Qemu-devel] [PULL 1/5] migration: Fix regression with compression threads, Juan Quintela, 2017/05/12
- [Qemu-devel] [PULL 3/5] ram: Rename RAM_SAVE_FLAG_COMPRESS to RAM_SAVE_FLAG_ZERO, Juan Quintela, 2017/05/12
- [Qemu-devel] [PULL 4/5] migration: Create block capabilities for shared and enable,
Juan Quintela <=
- [Qemu-devel] [PULL 5/5] migration: Create migration/blocker.h, Juan Quintela, 2017/05/12
- [Qemu-devel] [PULL 2/5] migration: Pass Error ** argument to {save, load}_vmstate, Juan Quintela, 2017/05/12
- Re: [Qemu-devel] [PULL 0/5] Migration pull request, Stefan Hajnoczi, 2017/05/15
- Re: [Qemu-devel] [PULL 0/5] Migration pull request, Stefan Hajnoczi, 2017/05/16