Wire up SPICE client relocation with QEMU migration

Use the graphics information from the QEMU migration cookie to
issue a 'client_migrate_info' monitor command to QEMU. This causes
the SPICE client to automatically reconnect to the target host
when migration completes

* src/qemu/qemu_migration.c: Set data for SPICE client relocation
  before starting migration on src
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h,
  src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_json.h,
  src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h: Add
  new qemuMonitorGraphicsRelocate() command

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5b3235025e70e2ed185af61e832e901fcf75a064..dce570736571479d403c8ad5f4b1356c05bee32f 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -740,6 +740,39 @@ cleanup:
 }
 
 
+static int
+qemuDomainMigrateGraphicsRelocate(struct qemud_driver *driver,
+                                  virDomainObjPtr vm,
+                                  qemuMigrationCookiePtr cookie)
+{
+    qemuDomainObjPrivatePtr priv = vm->privateData;
+    int ret;
+
+    if (!cookie)
+        return 0;
+
+    if (!cookie->graphics)
+        return 0;
+
+    /* QEMU doesn't support VNC relocation yet, so
+     * skip it to avoid generating an error
+     */
+    if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE)
+        return 0;
+
+    qemuDomainObjEnterMonitorWithDriver(driver, vm);
+    ret = qemuMonitorGraphicsRelocate(priv->mon,
+                                      cookie->graphics->type,
+                                      cookie->hostname,
+                                      cookie->graphics->port,
+                                      cookie->graphics->tlsPort,
+                                      cookie->graphics->tlsSubject);
+    qemuDomainObjExitMonitorWithDriver(driver, vm);
+
+    return ret;
+}
+
+
 /* Prepare is the first step, and it runs on the destination host.
  *
  * This version starts an empty VM listening on a localhost TCP port, and
@@ -1127,6 +1160,9 @@ static int doNativeMigrate(struct qemud_driver *driver,
                                        QEMU_MIGRATION_COOKIE_GRAPHICS)))
         goto cleanup;
 
+    if (qemuDomainMigrateGraphicsRelocate(driver, vm, mig) < 0)
+        VIR_WARN("unable to provide data for graphics client relocation");
+
     /* Issue the migrate command. */
     if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri, "tcp://")) {
         /* HACK: source host generates bogus URIs, so fix them up */
@@ -1259,6 +1295,9 @@ static int doTunnelMigrate(struct qemud_driver *driver,
      *   3. start migration on source
      */
 
+    /*
+     * XXX need to support migration cookies
+     */
 
     /* Stage 1. setup local support infrastructure */
 

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index bbc1540d27a122aa6b08563fa7efefbe738c4c3c..5186f99f95aa569a7694685dd99d9adc97f45372 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1640,6 +1640,37 @@ int qemuMonitorMigrateCancel(qemuMonitorPtr mon)
     return ret;
 }
 
+
+int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon,
+                                int type,
+                                const char *hostname,
+                                int port,
+                                int tlsPort,
+                                const char *tlsSubject)
+{
+    int ret;
+    VIR_DEBUG("mon=%p type=%d hostname=%s port=%d tlsPort=%d tlsSubject=%s",
+              mon, type, hostname, port, tlsPort, NULLSTR(tlsSubject));
+
+    if (mon->json)
+        ret = qemuMonitorJSONGraphicsRelocate(mon,
+                                              type,
+                                              hostname,
+                                              port,
+                                              tlsPort,
+                                              tlsSubject);
+    else
+        ret = qemuMonitorTextGraphicsRelocate(mon,
+                                              type,
+                                              hostname,
+                                              port,
+                                              tlsPort,
+                                              tlsSubject);
+
+    return ret;
+}
+
+
 int qemuMonitorAddUSBDisk(qemuMonitorPtr mon,
                           const char *path)
 {

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 476a73fa53e486dbb9bb960d58e543b1ff880b63..05c3359fbcfdc4911ba6e0bcd06878c4d7807a69 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -305,6 +305,12 @@ int qemuMonitorMigrateToUnix(qemuMonitorPtr mon,
 
 int qemuMonitorMigrateCancel(qemuMonitorPtr mon);
 
+int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon,
+                                int type,
+                                const char *hostname,
+                                int port,
+                                int tlsPort,
+                                const char *tlsSubject);
 
 /* XXX disk driver type eg,  qcow/etc.
  * XXX cache mode

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 52f0b019567da7a0d89271c4bff80196dcc3794a..2d8a390cef5fde67e6b739be4be4bd3f15f726f1 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1862,6 +1862,38 @@ int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon)
 }
 
 
+int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon,
+                                    int type,
+                                    const char *hostname,
+                                    int port,
+                                    int tlsPort,
+                                    const char *tlsSubject)
+{
+    int ret = -1;
+    virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("client_migrate_info",
+                                                     "s:protocol",
+                                                     (type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE ? "spice" : "vnc"),
+                                                     "s:hostname", hostname,
+                                                     "i:port", port,
+                                                     "i:tls-port", tlsPort,
+                                                     (tlsSubject ? "s:cert-subject" : NULL),
+                                                     (tlsSubject ? tlsSubject : NULL),
+                                                     NULL);
+    virJSONValuePtr reply = NULL;
+    if (!cmd)
+        return -1;
+
+    ret = qemuMonitorJSONCommand(mon, cmd, &reply);
+
+    if (ret == 0)
+        ret = qemuMonitorJSONCheckError(cmd, reply);
+
+    virJSONValueFree(cmd);
+    virJSONValueFree(reply);
+    return ret;
+}
+
+
 int qemuMonitorJSONAddUSBDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
                               const char *path ATTRIBUTE_UNUSED)
 {

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index cabb77f938c54a60bfe6f85b32476084f5e3ee17..ec79b03ff2d3bd683df6f48603e791205f51a3c6 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -118,6 +118,13 @@ int qemuMonitorJSONMigrate(qemuMonitorPtr mon,
 
 int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon);
 
+int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon,
+                                    int type,
+                                    const char *hostname,
+                                    int port,
+                                    int tlsPort,
+                                    const char *tlsSubject);
+
 int qemuMonitorJSONAddUSBDisk(qemuMonitorPtr mon,
                               const char *path);
 

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 2d17de0efb28c6bf56b7fc206bd301e86d39ace8..106f2d3770f4a354fb439a31287206fbb8163054 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1312,6 +1312,37 @@ int qemuMonitorTextMigrateCancel(qemuMonitorPtr mon)
     return 0;
 }
 
+
+int qemuMonitorTextGraphicsRelocate(qemuMonitorPtr mon,
+                                    int type,
+                                    const char *hostname,
+                                    int port,
+                                    int tlsPort,
+                                    const char *tlsSubject)
+{
+    char *cmd;
+    char *info = NULL;
+
+    if (virAsprintf(&cmd, "client_migrate_info %s %s %d %d %s",
+                    type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE ? "spice" : "vnc",
+                    hostname, port, tlsPort, tlsSubject ? tlsSubject : "") < 0) {
+        virReportOOMError();
+        return -1;
+    }
+
+    if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) {
+        VIR_FREE(cmd);
+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                        "%s", _("cannot run monitor command to relocate graphics client"));
+        return -1;
+    }
+    VIR_FREE(cmd);
+    VIR_FREE(info);
+
+    return 0;
+}
+
+
 int qemuMonitorTextAddUSBDisk(qemuMonitorPtr mon,
                               const char *path)
 {

diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h
index 148e92f288b5a365d2ff0918c8a8e6a5712cf3e2..8a69105edad34f0ff0b211e2c875161fb521257c 100644 (file)
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@@ -114,6 +114,13 @@ int qemuMonitorTextMigrate(qemuMonitorPtr mon,
 
 int qemuMonitorTextMigrateCancel(qemuMonitorPtr mon);
 
+int qemuMonitorTextGraphicsRelocate(qemuMonitorPtr mon,
+                                    int type,
+                                    const char *hostname,
+                                    int port,
+                                    int tlsPort,
+                                    const char *tlsSubject);
+
 int qemuMonitorTextAddUSBDisk(qemuMonitorPtr mon,
                               const char *path);