From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, liang.z.li@intel.com, mjt@tls.msk.ru,
amit.shah@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v2 1/3] Add -incoming pause
Date: Wed, 11 Feb 2015 16:46:22 +0000 [thread overview]
Message-ID: <1423673184-5903-2-git-send-email-dgilbert@redhat.com> (raw)
In-Reply-To: <1423673184-5903-1-git-send-email-dgilbert@redhat.com>
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-incoming pause causes qemu to wait for an incoming migration
to be specified later. The monitor can be used to set migration
capabilities that may affect the incoming connection process.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index b3adbc6..77263a5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -49,6 +49,8 @@ enum {
static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
+static bool paused_incoming;
+
/* When we add fault tolerance, we could have several
migrations at once. For now we don't need to add
dynamic creation of migration */
@@ -65,25 +67,40 @@ MigrationState *migrate_get_current(void)
return ¤t_migration;
}
+/*
+ * Called on -incoming with a pause: uri.
+ * The migration can be started later after any parameters have been
+ * changed.
+ */
+static void paused_incoming_migration(Error **errp)
+{
+ if (paused_incoming) {
+ error_setg(errp, "Pausing an already paused incoming migration");
+ }
+ paused_incoming = true;
+}
+
void qemu_start_incoming_migration(const char *uri, Error **errp)
{
const char *p;
- if (strstart(uri, "tcp:", &p))
+ if (!strcmp(uri, "pause")) {
+ paused_incoming_migration(errp);
+ } else if (strstart(uri, "tcp:", &p)) {
tcp_start_incoming_migration(p, errp);
#ifdef CONFIG_RDMA
- else if (strstart(uri, "rdma:", &p))
+ } else if (strstart(uri, "rdma:", &p)) {
rdma_start_incoming_migration(p, errp);
#endif
#if !defined(WIN32)
- else if (strstart(uri, "exec:", &p))
+ } else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp);
- else if (strstart(uri, "unix:", &p))
+ } else if (strstart(uri, "unix:", &p)) {
unix_start_incoming_migration(p, errp);
- else if (strstart(uri, "fd:", &p))
+ } else if (strstart(uri, "fd:", &p)) {
fd_start_incoming_migration(p, errp);
#endif
- else {
+ } else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
}
--
2.1.0
next prev parent reply other threads:[~2015-02-11 16:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 16:46 [Qemu-devel] [PATCH v2 0/3] -incoming pause Dr. David Alan Gilbert (git)
2015-02-11 16:46 ` Dr. David Alan Gilbert (git) [this message]
2015-02-11 16:46 ` [Qemu-devel] [PATCH v2 2/3] Add migrate_incoming Dr. David Alan Gilbert (git)
2015-02-11 17:19 ` Eric Blake
2015-02-11 18:24 ` Juan Quintela
2015-02-11 18:20 ` Juan Quintela
2015-02-11 18:22 ` Dr. David Alan Gilbert
2015-02-11 16:46 ` [Qemu-devel] [PATCH v2 3/3] Document -incoming options Dr. David Alan Gilbert (git)
2015-02-17 12:46 ` [Qemu-devel] [PATCH v2 0/3] -incoming pause Amit Shah
2015-02-17 13:27 ` Dr. David Alan Gilbert
2015-02-17 14:59 ` Amit Shah
2015-02-17 16:14 ` Eric Blake
2015-02-17 20:13 ` Dr. David Alan Gilbert
2015-02-18 5:43 ` Amit Shah
2015-02-18 5:40 ` Amit Shah
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=1423673184-5903-2-git-send-email-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=amit.shah@redhat.com \
--cc=liang.z.li@intel.com \
--cc=mjt@tls.msk.ru \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.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).