Skip to contentSkip to conversation

-incoming pause

PATCH Superseded Dr. David Alan Gilbert (git) 4 participants 13 messages Feb 10, 2015 – Feb 11, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover -incoming pause

From: "Dr. David Alan Gilbert" <[email protected]>

This patchset provides a way of setting options on an incoming migration before the fd/process/socket has been created.

start qemu with -incoming pause
<use the monitor to set whatever you need>
migrate -u theuri

Dave

Dr. David Alan Gilbert (3):
Add -incoming pause
Add migrate -u option for -incoming pause
Document -incoming options

 hmp-commands.hx       | 11 +++++++----
 hmp.c                 |  6 ++++--
 migration/migration.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
 qapi-schema.json      |  5 ++++-
 qemu-options.hx       | 29 ++++++++++++++++++++++++++---
 qmp-commands.hx       |  3 ++-
 6 files changed, 86 insertions(+), 18 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/3 Add -incoming pause

From: "Dr. David Alan Gilbert" <[email protected]>

-incoming pause causes qemu to wait for an incoming migration to be specified later. The monitor can be used to set migraiton capabilities that may affect the incoming connection process.

---
 migration/migration.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)
migration/migration.c +23 -6
index b3adbc6..77263a5 100644
@@ -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 &current_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);
     }
 }
Signature · 1 line
2.1.0
Reviewed-by on v1 1/3
#2 lore raw

Re: [Qemu-devel] [PATCH 1/3] Add -incoming pause

Quoted 6 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

-incoming pause causes qemu to wait for an incoming migration to be specified later. The monitor can be used to set migraiton capabilities that may affect the incoming connection process.

#3 lore raw

PATCH 2/3 Add migrate -u option for -incoming pause

In reply to Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the
migration can be started by issuing:

migrate -u uri

---
 hmp-commands.hx       | 11 +++++++----
 hmp.c                 |  6 ++++--
 migration/migration.c | 21 ++++++++++++++++++++-
 qapi-schema.json      |  5 ++++-
 qmp-commands.hx       |  3 ++-
 5 files changed, 37 insertions(+), 9 deletions(-)
hmp-commands.hx +7 -4
index e37bc8b..45f293a 100644
@@ -887,23 +887,26 @@ ETEXI
 
     {
         .name       = "migrate",
-        .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
-        .params     = "[-d] [-b] [-i] uri",
+        .args_type  = "detach:-d,blk:-b,inc:-i,unpause:-u,uri:s",
+        .params     = "[-d] [-b] [-i] [-u] uri",
         .help       = "migrate to URI (using -d to not wait for completion)"
 		      "\n\t\t\t -b for migration without shared storage with"
 		      " full copy of disk\n\t\t\t -i for migration without "
 		      "shared storage with incremental copy of disk "
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+                      "\n\t\t\t -u unpauses an incoming migration started with "
+                      "-incoming pause using the given uri.",
         .mhandler.cmd = hmp_migrate,
     },
 
 
 STEXI
-@item migrate [-d] [-b] [-i] @var{uri}
+@item migrate [-d] [-b] [-i] [-u] @var{uri}
 @findex migrate
 Migrate to @var{uri} (using -d to not wait for completion).
 	-b for migration with full copy of disk
 	-i for migration with incremental copy of disk (base image is shared)
+        -u to unpause an incoming migration started with -incoming pause
 ETEXI
 
     {
hmp.c +4 -2
index b47f331..fb0cde1 100644
@@ -1344,17 +1344,19 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
     int detach = qdict_get_try_bool(qdict, "detach", 0);
     int blk = qdict_get_try_bool(qdict, "blk", 0);
     int inc = qdict_get_try_bool(qdict, "inc", 0);
+    int unpause = qdict_get_try_bool(qdict, "unpause", 0);
     const char *uri = qdict_get_str(qdict, "uri");
     Error *err = NULL;
 
-    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);
+    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, !!unpause, unpause,
+                &err);
     if (err) {
         monitor_printf(mon, "migrate: %s\n", error_get_pretty(err));
         error_free(err);
         return;
     }
 
-    if (!detach) {
+    if (!detach && !unpause) {
         MigrationStatus *status;
 
         if (monitor_suspend(mon) < 0) {
migration/migration.c +20 -1
index 77263a5..2308067 100644
@@ -434,7 +434,7 @@ void migrate_del_blocker(Error *reason)
 
 void qmp_migrate(const char *uri, bool has_blk, bool blk,
                  bool has_inc, bool inc, bool has_detach, bool detach,
-                 Error **errp)
+                 bool has_unpause, bool unpause, Error **errp)
 {
     Error *local_err = NULL;
     MigrationState *s = migrate_get_current();
@@ -450,6 +450,25 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
         return;
     }
 
+    if (unpause) {
+        /* Unpause is starting up an *incoming* migration */
+        if (detach || inc || blk) {
+            error_setg(errp, "Other flags are not meaningful for unpause");
+            return;
+        }
+
+        if (!paused_incoming) {
+            error_setg(errp, "Unpause can only be used with -incoming pause");
+            return;
+        }
+
+        qemu_start_incoming_migration(uri, errp);
+        if (!errp || !*errp) {
+            paused_incoming = false;
+        }
+        return;
+    }
+
     if (runstate_check(RUN_STATE_INMIGRATE)) {
         error_setg(errp, "Guest is waiting for an incoming migration");
         return;
qapi-schema.json +4 -1
index e16f8eb..8dd0b88 100644
@@ -1731,12 +1731,15 @@
 # @detach: this argument exists only for compatibility reasons and
 #          is ignored by QEMU
 #
+# @unpause: Start an inward migration initiated with -incoming pause
+#
 # Returns: nothing on success
 #
 # Since: 0.14.0
 ##
 { 'command': 'migrate',
-  'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } }
+  'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool',
+           '*unpause': 'bool' } }
 
 # @xen-save-devices-state:
 #
qmp-commands.hx +2 -1
index a85d847..76673c5 100644
@@ -610,7 +610,7 @@ EQMP
 
     {
         .name       = "migrate",
-        .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
+        .args_type  = "detach:-d,blk:-b,inc:-i,unpause:-u,uri:s",
         .mhandler.cmd_new = qmp_marshal_input_migrate,
     },
 
@@ -624,6 +624,7 @@ Arguments:
 
 - "blk": block migration, full disk copy (json-bool, optional)
 - "inc": incremental disk copy (json-bool, optional)
+- "unpause": Unpause an incoming migration (json-bool, optional)
 - "uri": Destination URI (json-string)
 
 Example:
Signature · 1 line
2.1.0
#4 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

Quoted 106 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the
migration can be started by issuing:

migrate -u uri

---
 hmp-commands.hx       | 11 +++++++----
 hmp.c                 |  6 ++++--
 migration/migration.c | 21 ++++++++++++++++++++-
 qapi-schema.json      |  5 ++++-
 qmp-commands.hx       |  3 ++-
 5 files changed, 37 insertions(+), 9 deletions(-)
hmp-commands.hx +7 -4
index e37bc8b..45f293a 100644
@@ -887,23 +887,26 @@ ETEXI
 
     {
         .name       = "migrate",
-        .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
-        .params     = "[-d] [-b] [-i] uri",
+        .args_type  = "detach:-d,blk:-b,inc:-i,unpause:-u,uri:s",
+        .params     = "[-d] [-b] [-i] [-u] uri",
         .help       = "migrate to URI (using -d to not wait for completion)"
 		      "\n\t\t\t -b for migration without shared storage with"
 		      " full copy of disk\n\t\t\t -i for migration without "
 		      "shared storage with incremental copy of disk "
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+                      "\n\t\t\t -u unpauses an incoming migration started with "
+                      "-incoming pause using the given uri.",
         .mhandler.cmd = hmp_migrate,
     },
 
 
 STEXI
-@item migrate [-d] [-b] [-i] @var{uri}
+@item migrate [-d] [-b] [-i] [-u] @var{uri}
 @findex migrate
 Migrate to @var{uri} (using -d to not wait for completion).
 	-b for migration with full copy of disk
 	-i for migration with incremental copy of disk (base image is shared)
+        -u to unpause an incoming migration started with -incoming pause
 ETEXI
 
     {
hmp.c +4 -2
index b47f331..fb0cde1 100644
@@ -1344,17 +1344,19 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
     int detach = qdict_get_try_bool(qdict, "detach", 0);
     int blk = qdict_get_try_bool(qdict, "blk", 0);
     int inc = qdict_get_try_bool(qdict, "inc", 0);
+    int unpause = qdict_get_try_bool(qdict, "unpause", 0);
     const char *uri = qdict_get_str(qdict, "uri");
     Error *err = NULL;
 
-    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);
+    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, !!unpause, unpause,
+                &err);
     if (err) {
         monitor_printf(mon, "migrate: %s\n", error_get_pretty(err));
         error_free(err);
         return;
     }
 
-    if (!detach) {
+    if (!detach && !unpause) {
         MigrationStatus *status;
 
         if (monitor_suspend(mon) < 0) {
migration/migration.c +13 -1
index 77263a5..2308067 100644
@@ -434,7 +434,7 @@ void migrate_del_blocker(Error *reason)
 
 void qmp_migrate(const char *uri, bool has_blk, bool blk,
                  bool has_inc, bool inc, bool has_detach, bool detach,
-                 Error **errp)
+                 bool has_unpause, bool unpause, Error **errp)
 {
     Error *local_err = NULL;
     MigrationState *s = migrate_get_current();
@@ -450,6 +450,25 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
         return;
     }
 
+    if (unpause) {
+        /* Unpause is starting up an *incoming* migration */
+        if (detach || inc || blk) {
+            error_setg(errp, "Other flags are not meaningful for unpause");
+            return;
+        }
+
+        if (!paused_incoming) {
+            error_setg(errp, "Unpause can only be used with -incoming pause");
+            return;
+        }
+

migration/migration.c void qmp_migrate(const char *uri, bool has_blk, bool blk, · line 474

Quoted 10 lines
migration/migration.c +7 -0
+        qemu_start_incoming_migration(uri, errp);
+        if (!errp || !*errp) {
+            paused_incoming = false;
+        }
+        return;
+    }
+
     if (runstate_check(RUN_STATE_INMIGRATE)) {
         error_setg(errp, "Guest is waiting for an incoming migration");
         return;

Hmm, the 'unpause' codepath doesn't really share anything with the existing codepath. Also the URIs for the existing migrate command are not quite the same as the URIs for the incoming migrate side. This would suggest to me that it might be better to have a separate 'migrate-incoming' command in the monitor rather than overload the existing 'migrate' command.

Also having a separate command will make it possible to detect that this feature is supported from libvirt, since I don't think QMP introspection provides enough info to detect it based on the new arg to existing commands.

Regards,
Daniel

Signature · 4 lines
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|
#5 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

Quoted 4 lines · Daniel P. Berrange
Quoted 3 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the

s/pause the/pause, the/

Quoted 13 lines
Quoted 6 lines

migration can be started by issuing:

migrate -u uri

---

Hmm, the 'unpause' codepath doesn't really share anything with the existing codepath. Also the URIs for the existing migrate command are not quite the same as the URIs for the incoming migrate side. This would suggest to me that it might be better to have a separate 'migrate-incoming' command in the monitor rather than overload the existing 'migrate' command.

Quoted 4 lines

Also having a separate command will make it possible to detect that this feature is supported from libvirt, since I don't think QMP introspection provides enough info to detect it based on the new arg to existing commands.

Agree, a new command for QMP would be better (it serves as both the new command to use, and the witness that the '-incoming pause:' command line works). The HMP 'migrate -u' is just fine, though (it's fine to have a single HMP command smart enough to call out to two different QMP commands).

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
#6 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

Quoted 26 lines · * Eric Blake ([email protected]) wrote:
Quoted 4 lines · Daniel P. Berrange
Quoted 3 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the

s/pause the/pause, the/

Quoted 13 lines
Quoted 6 lines

migration can be started by issuing:

migrate -u uri

---

Hmm, the 'unpause' codepath doesn't really share anything with the existing codepath. Also the URIs for the existing migrate command are not quite the same as the URIs for the incoming migrate side. This would suggest to me that it might be better to have a separate 'migrate-incoming' command in the monitor rather than overload the existing 'migrate' command.

Quoted 4 lines

Also having a separate command will make it possible to detect that this feature is supported from libvirt, since I don't think QMP introspection provides enough info to detect it based on the new arg to existing commands.

Quoted 4 lines

Agree, a new command for QMP would be better (it serves as both the new command to use, and the witness that the '-incoming pause:' command line works). The HMP 'migrate -u' is just fine, though (it's fine to have a single HMP command smart enough to call out to two different QMP commands).

I've split it out as you all suggested; I made it migrate-incoming and also made an HMP migrate_incoming; although as you say you can merge them, I just find it easier when they match - if you're used to using an HMP command it's easier when you need to find the matching QMP command.

Dave

Quoted 5 lines
Signature · 3 lines
-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#7 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

Quoted 9 lines · Dr. David Alan Gilbert
Quoted 4 lines

Agree, a new command for QMP would be better (it serves as both the new command to use, and the witness that the '-incoming pause:' command line works). The HMP 'migrate -u' is just fine, though (it's fine to have a single HMP command smart enough to call out to two different QMP commands).

I've split it out as you all suggested; I made it migrate-incoming and also made an HMP migrate_incoming; although as you say you can merge them, I just find it easier when they match - if you're used to using an HMP command it's easier when you need to find the matching QMP command.

Fair enough; HMP exists for ease-of-use, so whichever way you found easier to code is sufficient :)

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
#8 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

In reply to Daniel P. Berrange
Quoted 124 lines · * Daniel P. Berrange ([email protected]) wrote:
Quoted 106 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the
migration can be started by issuing:

migrate -u uri

---
 hmp-commands.hx       | 11 +++++++----
 hmp.c                 |  6 ++++--
 migration/migration.c | 21 ++++++++++++++++++++-
 qapi-schema.json      |  5 ++++-
 qmp-commands.hx       |  3 ++-
 5 files changed, 37 insertions(+), 9 deletions(-)
hmp-commands.hx +7 -4
index e37bc8b..45f293a 100644
@@ -887,23 +887,26 @@ ETEXI
 
     {
         .name       = "migrate",
-        .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
-        .params     = "[-d] [-b] [-i] uri",
+        .args_type  = "detach:-d,blk:-b,inc:-i,unpause:-u,uri:s",
+        .params     = "[-d] [-b] [-i] [-u] uri",
         .help       = "migrate to URI (using -d to not wait for completion)"
 		      "\n\t\t\t -b for migration without shared storage with"
 		      " full copy of disk\n\t\t\t -i for migration without "
 		      "shared storage with incremental copy of disk "
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+                      "\n\t\t\t -u unpauses an incoming migration started with "
+                      "-incoming pause using the given uri.",
         .mhandler.cmd = hmp_migrate,
     },
 
 
 STEXI
-@item migrate [-d] [-b] [-i] @var{uri}
+@item migrate [-d] [-b] [-i] [-u] @var{uri}
 @findex migrate
 Migrate to @var{uri} (using -d to not wait for completion).
 	-b for migration with full copy of disk
 	-i for migration with incremental copy of disk (base image is shared)
+        -u to unpause an incoming migration started with -incoming pause
 ETEXI
 
     {
hmp.c +4 -2
index b47f331..fb0cde1 100644
@@ -1344,17 +1344,19 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
     int detach = qdict_get_try_bool(qdict, "detach", 0);
     int blk = qdict_get_try_bool(qdict, "blk", 0);
     int inc = qdict_get_try_bool(qdict, "inc", 0);
+    int unpause = qdict_get_try_bool(qdict, "unpause", 0);
     const char *uri = qdict_get_str(qdict, "uri");
     Error *err = NULL;
 
-    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);
+    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, !!unpause, unpause,
+                &err);
     if (err) {
         monitor_printf(mon, "migrate: %s\n", error_get_pretty(err));
         error_free(err);
         return;
     }
 
-    if (!detach) {
+    if (!detach && !unpause) {
         MigrationStatus *status;
 
         if (monitor_suspend(mon) < 0) {
migration/migration.c +13 -1
index 77263a5..2308067 100644
@@ -434,7 +434,7 @@ void migrate_del_blocker(Error *reason)
 
 void qmp_migrate(const char *uri, bool has_blk, bool blk,
                  bool has_inc, bool inc, bool has_detach, bool detach,
-                 Error **errp)
+                 bool has_unpause, bool unpause, Error **errp)
 {
     Error *local_err = NULL;
     MigrationState *s = migrate_get_current();
@@ -450,6 +450,25 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
         return;
     }
 
+    if (unpause) {
+        /* Unpause is starting up an *incoming* migration */
+        if (detach || inc || blk) {
+            error_setg(errp, "Other flags are not meaningful for unpause");
+            return;
+        }
+
+        if (!paused_incoming) {
+            error_setg(errp, "Unpause can only be used with -incoming pause");
+            return;
+        }
+

migration/migration.c void qmp_migrate(const char *uri, bool has_blk, bool blk, · line 474

Quoted 10 lines
migration/migration.c +7 -0
+        qemu_start_incoming_migration(uri, errp);
+        if (!errp || !*errp) {
+            paused_incoming = false;
+        }
+        return;
+    }
+
     if (runstate_check(RUN_STATE_INMIGRATE)) {
         error_setg(errp, "Guest is waiting for an incoming migration");
         return;

Hmm, the 'unpause' codepath doesn't really share anything with the existing codepath. Also the URIs for the existing migrate command are not quite the same as the URIs for the incoming migrate side. This would suggest to me that it might be better to have a separate 'migrate-incoming' command in the monitor rather than overload the existing 'migrate' command.

Quoted 4 lines

Also having a separate command will make it possible to detect that this feature is supported from libvirt, since I don't think QMP introspection provides enough info to detect it based on the new arg to existing commands.

OK, that would be easy enough for me to split out.

I'm not completely convinced that the URI parsing is currently different between incoming and migrate; for example the 'migrate' command seems to blindly take ,to=4445 which I think it then ignores. But that's more of a bug.

Dave

Quoted 9 lines

Regards,
Daniel

Signature · 4 lines
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#9 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

In reply to Dr. David Alan Gilbert (git)

hmp-commands.hx ETEXI · line 898

Quoted 13 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the
migration can be started by issuing:

migrate -u uri

hmp-commands.hx +3 -1
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+                      "\n\t\t\t -u unpauses an incoming migration started with "
+                      "-incoming pause using the given uri.",

Spaces vs tabs.

Quoted 1 line

+ -u to unpause an incoming migration started with -incoming pause

more spaces

hmp.c void hmp_migrate(Monitor *mon, const QDict *qdict) · line 1352

Quoted 3 lines
hmp.c +2 -1
-    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);
+    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, !!unpause, unpause,
+                &err);

I don't claim to understand QMP, but this whole bussines of !!foo, foo is getting confusing, no?

No, this is not relaced to this patch.

Review void qmp_migrate(const char *uri, bool has_blk, bool blk, · line 452

Quoted 7 lines
 {
     Error *local_err = NULL;
     MigrationState *s = migrate_get_current();
(quoted diff) +0 -0
@@ -450,6 +450,25 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
         return;
     }
 

I would preffer something like:

    if (runstate_check(RUN_STATE_INMIGRATE)) {
        if (unpause) {
            ... unpause code
        }
    } else {
        error_setg(errp, "Guest is waiting for an incoming migration");
        return;
    }

    if (unpause) {
        error_setg(errp, "Guest is waiting for an incoming migration");
        return;
    }

    if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP ||
        s->state == MIG_STATE_CANCELLING) {
        error_set(errp, QERR_MIGRATION_ACTIVE);
        return;
    }

    if (qemu_savevm_state_blocked(errp)) {
        return;
    }

.... and now continue with the rest ...

Thinking more about this problem, I am not sure this is the "cleanest
approach". What do you think of:

- create RUN_STATE_INMIGRATE_PAUSED
bonus: no need of paused_incoming variable

- create a new migrate_incoming command

And then we have cleaner separation of what we are doing?

Later, Juan.

#10 lore raw

Re: [Qemu-devel] [PATCH 2/3] Add migrate -u option for -incoming pause

Quoted 17 lines · * Juan Quintela ([email protected]) wrote:

hmp-commands.hx ETEXI · line 898

Quoted 13 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Once a qemu has been started with -incoming pause the
migration can be started by issuing:

migrate -u uri

hmp-commands.hx +3 -1
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+                      "\n\t\t\t -u unpauses an incoming migration started with "
+                      "-incoming pause using the given uri.",

Spaces vs tabs.

Quoted 3 lines
Quoted 1 line

+ -u to unpause an incoming migration started with -incoming pause

more spaces

All this is reworked anyway since I split it out.

Quoted 6 lines

hmp.c void hmp_migrate(Monitor *mon, const QDict *qdict) · line 1352

Quoted 3 lines
hmp.c +2 -1
-    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);
+    qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, !!unpause, unpause,
+                &err);

I don't claim to understand QMP, but this whole bussines of !!foo, foo is getting confusing, no?

Yes, and it's very very easy to screw up and get them in the wrong order.

Quoted 36 lines

No, this is not relaced to this patch.

Review void qmp_migrate(const char *uri, bool has_blk, bool blk, · line 452

Quoted 7 lines
 {
     Error *local_err = NULL;
     MigrationState *s = migrate_get_current();
(quoted diff) +0 -0
@@ -450,6 +450,25 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
         return;
     }
 

I would preffer something like:

    if (runstate_check(RUN_STATE_INMIGRATE)) {
        if (unpause) {
            ... unpause code
        }
    } else {
        error_setg(errp, "Guest is waiting for an incoming migration");
        return;
    }

    if (unpause) {
        error_setg(errp, "Guest is waiting for an incoming migration");
        return;
    }

    if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP ||
        s->state == MIG_STATE_CANCELLING) {
        error_set(errp, QERR_MIGRATION_ACTIVE);
        return;
    }

    if (qemu_savevm_state_blocked(errp)) {
        return;
    }
Quoted 1 line

.... and now continue with the rest ...

Again, all gone in the new version.

Quoted 5 lines

Thinking more about this problem, I am not sure this is the "cleanest
approach". What do you think of:

- create RUN_STATE_INMIGRATE_PAUSED
bonus: no need of paused_incoming variable

That we could do separately; doing that means carefully looking at the existing users of RUN_STATE_INMIGRATE, and since it's a visible state that includes anything that uses the interface.

Quoted 3 lines

- create a new migrate_incoming command

And then we have cleaner separation of what we are doing?

Done.

Dave

Quoted 3 lines

Later, Juan.

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#11 lore raw

PATCH 3/3 Document -incoming options

In reply to Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Document the various URI formats for -incoming, the previous manpage and help text was wrong (out of date?)

---
 qemu-options.hx | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)
qemu-options.hx +26 -3
index 85ca3ad..aae9a99 100644
@@ -3169,12 +3169,35 @@ Set TB size.
 ETEXI
 
 DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
-    "-incoming p     prepare for incoming migration, listen on port p\n",
+    "-incoming uri   prepare for incoming migration, specifying source:\n" \
+    "                exec:command    Execute 'command' use the stdout as\n" \
+    "                                the migration stream\n" \
+    "                fd:num          listen on the given fd\n" \
+    "                pause           wait for the URI to be specified by\n" \
+    "                                the monitor (migrate -u)\n" \
+    "                rdma:addr:port  Listen on RDMA port on given address\n" \
+    "                tcp:addr:port   listen on TCP port (optional address)\n" \
+    "                unix:path       listen on the UNIX socket 'path'\n", \
     QEMU_ARCH_ALL)
 STEXI
-@item -incoming @var{port}
+@item -incoming @var{uri}
 @findex -incoming
-Prepare for incoming migration, listen on @var{port}.
+Prepare for incoming migration, specifying the source of the migration stream
+@table @option
+@item exec:@var{command}
+Execute 'command' and use the stdout as the migration stream.
+@item fd:@var{num}
+listen on the given fd
+@item pause
+wait for the URI to be specified by the monitor (migrate -u)
+@item rdma:@var{addr}:@var{port}
+Listen on RDMA port on given address
+@item tcp:@var{addr}:@var{port}[,ipv4][,ipv6][,to=to]
+Listen on TCP port @var{port} (optional @var{addr} to specify address to listen on).
+The options ,ipv4, ipv6 and ,to are used in the same manner as chardev TCP options.
+@item unix:@var{path}
+listen on the UNIX socket @var{path}
+@end table
 ETEXI
 
 DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
Signature · 1 line
2.1.0
Reviewed-by on v1 3/3
#12 lore raw

Re: [Qemu-devel] [PATCH 3/3] Document -incoming options

Quoted 6 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Document the various URI formats for -incoming, the previous manpage and help text was wrong (out of date?)

My good, this was old. I think that patch is needed without the paused part, independenly of what we do with pause.

For what is worth, I don't rememeber that "documented syntax".

Later, Juan.