From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aarcange@redhat.com, aliguori@us.ibm.com,
Lei Li <lilei@linux.vnet.ibm.com>,
quintela@redhat.com, mrhines@linux.vnet.ibm.com,
lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 11/18] migration: introduce capability localhost
Date: Wed, 21 Aug 2013 15:18:48 +0800 [thread overview]
Message-ID: <1377069536-12658-12-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1377069536-12658-1-git-send-email-lilei@linux.vnet.ibm.com>
Introduce migration capability localhost.
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
include/migration/migration.h | 3 +++
migration.c | 12 ++++++++++++
qapi-schema.json | 8 +++++++-
3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d2c7eff..a04f050 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -143,10 +143,13 @@ void migrate_add_blocker(Error *reason);
void migrate_del_blocker(Error *reason);
bool migrate_rdma_pin_all(void);
+
bool migrate_zero_blocks(void);
bool migrate_auto_converge(void);
+bool migrate_is_localhost(void);
+
int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen,
uint8_t *dst, int dlen);
int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen);
diff --git a/migration.c b/migration.c
index 2446a6a..2f85358 100644
--- a/migration.c
+++ b/migration.c
@@ -420,6 +420,9 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else if (strstart(uri, "exec:", &p)) {
exec_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "unix:", &p)) {
+ if (s->enabled_capabilities[MIGRATION_CAPABILITY_LOCALHOST]) {
+ local_start_outgoing_migration(s, p, &local_err);
+ }
unix_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "fd:", &p)) {
fd_start_outgoing_migration(s, p, &local_err);
@@ -521,6 +524,15 @@ int migrate_use_xbzrle(void)
return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE];
}
+bool migrate_is_localhost(void)
+{
+ MigrationState *s;
+
+ s = migrate_get_current();
+
+ return s->enabled_capabilities[MIGRATION_CAPABILITY_LOCALHOST];
+}
+
int64_t migrate_xbzrle_cache_size(void)
{
MigrationState *s;
diff --git a/qapi-schema.json b/qapi-schema.json
index a51f7d2..557337f 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -629,10 +629,16 @@
# @auto-converge: If enabled, QEMU will automatically throttle down the guest
# to speed up convergence of RAM migration. (since 1.6)
#
+# @localhost: If enabled, QEMU will support localhost migration. This feature
+# allows live upgrade of a running QEMU instance by doing localhost
+# migration with page flipping. It requires the source and destination
+# are both on localhost. Disabled by default. (since 1.7)
+#
# Since: 1.2
##
{ 'enum': 'MigrationCapability',
- 'data': ['xbzrle', 'x-rdma-pin-all', 'auto-converge', 'zero-blocks'] }
+ 'data': ['xbzrle', 'x-rdma-pin-all', 'auto-converge', 'zero-blocks',
+ 'localhost'] }
##
# @MigrationCapabilityStatus
--
1.7.7.6
next prev parent reply other threads:[~2013-08-21 7:21 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 7:18 [Qemu-devel] [PATCH 0/18 RFC v3] Localhost migration Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 01/18] migration: export MIG_STATE_xxx flags Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 02/18] savevm: export qemu_save_device_state() Lei Li
2013-08-21 11:13 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 03/18] rename is_active to is_block_active Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 04/18] savevm: set right return value for qemu_file_rate_limit Lei Li
2013-08-21 10:42 ` Paolo Bonzini
2013-08-23 3:18 ` Lei Li
2013-08-23 5:34 ` Paolo Bonzini
2013-08-23 9:11 ` Lei Li
2013-08-23 9:14 ` Paolo Bonzini
2013-08-23 9:18 ` Lei Li
2013-08-23 9:22 ` Paolo Bonzini
2013-08-23 9:25 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 05/18] savevm: add comments for qemu_file_get_error() Lei Li
2013-08-21 10:43 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 06/18] bugfix: wrong error set by ram_control_load_hook() Lei Li
2013-08-21 10:40 ` Paolo Bonzini
2013-08-23 3:22 ` Lei Li
2013-08-23 5:34 ` Paolo Bonzini
2013-08-23 6:31 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 07/18] arch_init: export RAM_SAVE_xxx flags Lei Li
2013-08-21 10:49 ` Paolo Bonzini
2013-08-22 20:14 ` Michael R. Hines
2013-08-23 7:36 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 08/18] migration-local: introduce qemu_fopen_local() Lei Li
2013-08-22 20:42 ` Michael R. Hines
2013-08-23 7:44 ` Lei Li
2013-08-28 3:26 ` Lei Li
2013-08-28 6:37 ` Paolo Bonzini
2013-08-29 8:28 ` Lei Li
2013-08-29 14:05 ` Michael R. Hines
2013-08-21 7:18 ` [Qemu-devel] [PATCH 09/18] exec: export qemu_get_ram_block() Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 10/18] migration-local: implementation of outgoing part Lei Li
2013-08-21 10:44 ` Paolo Bonzini
2013-08-22 20:49 ` Michael R. Hines
2013-08-21 7:18 ` Lei Li [this message]
2013-08-21 15:08 ` [Qemu-devel] [PATCH 11/18] migration: introduce capability localhost Eric Blake
2013-08-28 4:22 ` Lei Li
2013-08-21 15:18 ` Paolo Bonzini
2013-08-22 20:50 ` Michael R. Hines
2013-08-23 7:40 ` Paolo Bonzini
2013-08-23 7:51 ` Lei Li
2013-08-23 8:01 ` Paolo Bonzini
2013-08-23 9:21 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 12/18] arch_init: factor out ram_save_blocks() Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 13/18] arch_init: adjust ram_save_setup() for migrate_is_localhost Lei Li
2013-08-21 10:48 ` Paolo Bonzini
2013-08-23 6:25 ` Lei Li
2013-08-23 7:48 ` Paolo Bonzini
2013-08-23 7:57 ` Alex Bligh
2013-08-23 8:06 ` Paolo Bonzini
2013-08-23 9:00 ` Lei Li
2013-08-23 9:12 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 14/18] arch_init: skip migration_bitmap_sync for local migration Lei Li
2013-08-21 10:50 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 15/18] migration: adjust migration_thread " Lei Li
2013-08-21 10:47 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 16/18] migration-local: implementation of incoming part Lei Li
2013-08-21 7:18 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 17/18] migration: add prefix for local migration to incoming migration Lei Li
2013-08-21 10:52 ` Paolo Bonzini
2013-08-23 14:02 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 18/18] hmp: better fomat for info migrate_capabilities Lei Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377069536-12658-12-git-send-email-lilei@linux.vnet.ibm.com \
--to=lilei@linux.vnet.ibm.com \
--cc=aarcange@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=lagarcia@br.ibm.com \
--cc=mrhines@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rcj@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).