From patchwork Thu Mar 14 15:12:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 227678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 715992C00B9 for ; Fri, 15 Mar 2013 02:13:18 +1100 (EST) Received: from localhost ([::1]:51597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UG9qG-0004sb-Cz for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2013 11:13:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UG9pr-0004sI-WA for qemu-devel@nongnu.org; Thu, 14 Mar 2013 11:13:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UG9pl-0006Xm-92 for qemu-devel@nongnu.org; Thu, 14 Mar 2013 11:12:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UG9pl-0006XX-1k for qemu-devel@nongnu.org; Thu, 14 Mar 2013 11:12:45 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2EFCiqO006739 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 11:12:44 -0400 Received: from localhost.localdomain (vpn1-7-40.ams2.redhat.com [10.36.7.40]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2EFCeS4006912; Thu, 14 Mar 2013 11:12:42 -0400 From: Alon Levy To: qemu-devel@nongnu.org, amit.shah@redhat.com Date: Thu, 14 Mar 2013 17:12:39 +0200 Message-Id: <1363273959-32298-1-git-send-email-alevy@redhat.com> In-Reply-To: <20130227123728.GA10426@amit.redhat.com> References: <20130227123728.GA10426@amit.redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] spice-qemu-char: register interface on post load X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The target has not seen the guest_connected event via spice_chr_guest_open or spice_chr_write, and so spice server wrongly assumes there is no agent active, while the client continues to send motion events only by the agent channel, which the server ignores. The net effect is that the mouse is static in the guest. By registering the interface on post load spice server will pass on the agent messages fixing the mouse behavior after migration. RHBZ #725965 Signed-off-by: Alon Levy v2: call qemu_del_timer, unregister vmstate --- spice-qemu-char.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index aea3d24..5f81d0e 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -2,6 +2,7 @@ #include "trace.h" #include "ui/qemu-spice.h" #include "char/char.h" +#include "migration/vmstate.h" #include #include #include @@ -26,6 +27,10 @@ typedef struct SpiceCharDriver { ssize_t bufsize, datalen; uint32_t debug; QLIST_ENTRY(SpiceCharDriver) next; + uint32_t guest_open; + struct { + QEMUTimer *timer; + } post_load; } SpiceCharDriver; static QLIST_HEAD(, SpiceCharDriver) spice_chars = @@ -178,25 +183,19 @@ static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len) return len; } -static void spice_chr_close(struct CharDriverState *chr) -{ - SpiceCharDriver *s = chr->opaque; - - printf("%s\n", __func__); - vmc_unregister_interface(s); - QLIST_REMOVE(s, next); - g_free(s); -} - static void spice_chr_guest_open(struct CharDriverState *chr) { SpiceCharDriver *s = chr->opaque; + + s->guest_open = 1; vmc_register_interface(s); } static void spice_chr_guest_close(struct CharDriverState *chr) { SpiceCharDriver *s = chr->opaque; + + s->guest_open = 0; vmc_unregister_interface(s); } @@ -217,6 +216,47 @@ static void print_allowed_subtypes(void) fprintf(stderr, "\n"); } +static void spice_chr_post_load_cb(void *opaque) +{ + SpiceCharDriver *s = opaque; + + spice_chr_guest_open(s->chr); +} + +static int spice_chr_post_load(void *opaque, int version_id) +{ + SpiceCharDriver *s = opaque; + + if (s && s->chr && s->guest_open) { + qemu_mod_timer(s->post_load.timer, 1); + } + return 0; +} + +static VMStateDescription spice_chr_vmstate = { + .name = "spice-chr", + .version_id = 1, + .minimum_version_id = 1, + .post_load = spice_chr_post_load, + .fields = (VMStateField[]) { + VMSTATE_UINT32(guest_open, SpiceCharDriver), + VMSTATE_END_OF_LIST() + }, +}; + +static void spice_chr_close(struct CharDriverState *chr) +{ + SpiceCharDriver *s = chr->opaque; + + printf("%s\n", __func__); + vmc_unregister_interface(s); + QLIST_REMOVE(s, next); + qemu_del_timer(s->post_load.timer); + qemu_free_timer(s->post_load.timer); + vmstate_unregister(NULL, &spice_chr_vmstate, s); + g_free(s); +} + static CharDriverState *chr_open(QemuOpts *opts, const char *subtype) { CharDriverState *chr; @@ -229,12 +269,16 @@ static CharDriverState *chr_open(QemuOpts *opts, const char *subtype) s->debug = debug; s->active = false; s->sin.subtype = subtype; + s->post_load.timer = qemu_new_timer_ns(vm_clock, + spice_chr_post_load_cb, s); chr->opaque = s; chr->chr_write = spice_chr_write; chr->chr_close = spice_chr_close; chr->chr_guest_open = spice_chr_guest_open; chr->chr_guest_close = spice_chr_guest_close; + vmstate_register(NULL, -1, &spice_chr_vmstate, s); + QLIST_INSERT_HEAD(&spice_chars, s, next); return chr;