From patchwork Mon Jan 3 14:53:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 77284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9E772B70AF for ; Tue, 4 Jan 2011 01:58:47 +1100 (EST) Received: from localhost ([127.0.0.1]:59191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZlrw-0001XC-N4 for incoming@patchwork.ozlabs.org; Mon, 03 Jan 2011 09:58:44 -0500 Received: from [140.186.70.92] (port=51884 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZln7-0007dz-2l for qemu-devel@nongnu.org; Mon, 03 Jan 2011 09:53:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZlmz-0005zN-BA for qemu-devel@nongnu.org; Mon, 03 Jan 2011 09:53:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZlmz-0005z9-4X for qemu-devel@nongnu.org; Mon, 03 Jan 2011 09:53:37 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p03Eramf017984 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 3 Jan 2011 09:53:36 -0500 Received: from rincewind.home.kraxel.org (vpn1-6-200.ams2.redhat.com [10.36.6.200]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p03ErX8A029637; Mon, 3 Jan 2011 09:53:34 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id A05EA413F5; Mon, 3 Jan 2011 15:53:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 3 Jan 2011 15:53:31 +0100 Message-Id: <1294066412-15000-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1294066412-15000-1-git-send-email-kraxel@redhat.com> References: <1294066412-15000-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/3] spice: client migration. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Handle spice client migration, i.e. inform a spice client connected about the new host and connection parameters, so it can move over the connection automatically. Signed-off-by: Gerd Hoffmann --- hmp-commands.hx | 20 ++++++++++++++++++++ qmp-commands.hx | 35 +++++++++++++++++++++++++++++++++++ ui/qemu-spice.h | 1 + ui/spice-core.c | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index df134f8..e6d8f36 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -815,6 +815,26 @@ ETEXI }, STEXI +@item spice_migrate_info @var{hostname} @var{port} @var{tls-port} @var{cert-subject} +@findex spice_migrate_info +Set the spice connection info for the migration target. The spice +server will ask the spice client to automatically reconnect using the +new parameters (if specified) once the vm migration finished +successfully. +ETEXI + +#if defined(CONFIG_SPICE) + { + .name = "spice_migrate_info", + .args_type = "hostname:s,port:i?,tls-port:i?,cert-subject:s?", + .params = "hostname port tls-port cert-subject", + .help = "send migration info to spice client", + .user_print = monitor_user_noop, + .mhandler.cmd_new = mon_spice_migrate, + }, +#endif + +STEXI @item snapshot_blkdev @findex snapshot_blkdev Snapshot device, using snapshot file as target if provided diff --git a/qmp-commands.hx b/qmp-commands.hx index 56c4d8b..24ada04 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -503,6 +503,41 @@ EQMP }, SQMP +spice_migrate_info +------------------ + +Set the spice connection info for the migration target. The spice +server will ask the spice client to automatically reconnect using the +new parameters (if specified) once the vm migration finished +successfully. + +Arguments: + +- "hostname": migration target hostname (json-string) +- "port": spice tcp port for plaintext channels (json-int, optional) +- "tls-port": spice tcp port for tls-secured channels (json-int, optional) +- "cert-subject": server certificate subject (json-string, optional) + +Example: + +-> { "execute": "spice_migrate_info", + "arguments": { "hostname": "virt42.lab.kraxel.org", "port": 1234 } } +<- { "return": {} } + +EQMP + +#if defined(CONFIG_SPICE) + { + .name = "spice_migrate_info", + .args_type = "hostname:s,port:i?,tls-port:i?,cert-subject:s?", + .params = "hostname port tls-port cert-subject", + .help = "send migration info to spice client", + .user_print = monitor_user_noop, + .mhandler.cmd_new = mon_spice_migrate, + }, +#endif + +SQMP migrate_set_speed ----------------- diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h index 48239c3..13de5ad 100644 --- a/ui/qemu-spice.h +++ b/ui/qemu-spice.h @@ -38,6 +38,7 @@ int qemu_spice_set_pw_expire(time_t expires); void do_info_spice_print(Monitor *mon, const QObject *data); void do_info_spice(Monitor *mon, QObject **ret_data); +int mon_spice_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); #else /* CONFIG_SPICE */ diff --git a/ui/spice-core.c b/ui/spice-core.c index 27a1ced..95116cc 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -30,11 +30,15 @@ #include "qbool.h" #include "qstring.h" #include "qjson.h" +#include "notify.h" +#include "migration.h" #include "monitor.h" +#include "hw/hw.h" /* core bits */ static SpiceServer *spice_server; +static Notifier migration_state; static const char *auth = "spice"; static char *auth_passwd; static time_t auth_expires = TIME_MAX; @@ -416,6 +420,39 @@ void do_info_spice(Monitor *mon, QObject **ret_data) *ret_data = QOBJECT(server); } +static void migration_state_notifier(Notifier *notifier) +{ + int state = get_migration_state(); + + if (state == MIG_STATE_COMPLETED) { +#if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */ + spice_server_migrate_switch(spice_server); +#endif + } +} + +int mon_spice_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + const char *hostname = qdict_get_str(qdict, "hostname"); + const char *subject = qdict_get_try_str(qdict, "cert-subject"); + int port = qdict_get_try_int(qdict, "port", -1); + int tls_port = qdict_get_try_int(qdict, "tls-port", -1); + int ret; + + if (!spice_server) { + qerror_report(QERR_DEVICE_NOT_ACTIVE, "spice"); + return -1; + } + + ret = spice_server_migrate_info(spice_server, hostname, + port, tls_port, subject); + if (ret != 0) { + qerror_report(QERR_UNDEFINED_ERROR); + return -1; + } + return 0; +} + static int add_channel(const char *name, const char *value, void *opaque) { int security = 0; @@ -573,6 +610,9 @@ void qemu_spice_init(void) spice_server_init(spice_server, &core_interface); using_spice = 1; + migration_state.notify = migration_state_notifier; + add_migration_state_change_notifier(&migration_state); + qemu_spice_input_init(); qemu_spice_audio_init();