From patchwork Thu Mar 21 16:35:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 229763 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 A97EE2C00CC for ; Fri, 22 Mar 2013 03:36:59 +1100 (EST) Received: from localhost ([::1]:39645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIiU5-0000ez-Ua for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2013 12:36:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIiSg-0007B3-Bb for qemu-devel@nongnu.org; Thu, 21 Mar 2013 12:35:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIiSZ-0001Bq-J1 for qemu-devel@nongnu.org; Thu, 21 Mar 2013 12:35:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIiSZ-0001BT-8q for qemu-devel@nongnu.org; Thu, 21 Mar 2013 12:35:23 -0400 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.14.4/8.14.4) with ESMTP id r2LGZMOw017683 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Mar 2013 12:35:22 -0400 Received: from garlic.tlv.redhat.com (spice-ovirt.tlv.redhat.com [10.35.4.71]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2LGZGpM001701; Thu, 21 Mar 2013 12:35:21 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2013 18:35:16 +0200 Message-Id: <1363883716-30289-3-git-send-email-alevy@redhat.com> In-Reply-To: <1363883716-30289-1-git-send-email-alevy@redhat.com> References: <87boadc2yp.fsf@codemonkey.ws> <1363883716-30289-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: amit.shah@redhat.com, hdegoede@redhat.com, aliguori@us.ibm.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 2/2] 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. Note that qemu_be_is_fe_connected is called when the vm is already running, to avoid any possible order of vmstate loading issue, i.e. device loading after chardev post_load being called back. RHBZ #725965 Signed-off-by: Alon Levy v3: don't store any state in vmstate, get it via qemu_be_is_fe_connected, that way we support multiple chardevices without having to specify a device in vmstate_register. --- spice-qemu-char.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 8a9236d..c457cc3 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 @@ -17,6 +18,9 @@ typedef struct SpiceCharDriver { uint8_t *datapos; ssize_t bufsize, datalen; QLIST_ENTRY(SpiceCharDriver) next; + struct { + QEMUTimer *timer; + } post_load; } SpiceCharDriver; static QLIST_HEAD(, SpiceCharDriver) spice_chars = @@ -173,6 +177,8 @@ static void spice_chr_close(struct CharDriverState *chr) #if SPICE_SERVER_VERSION >= 0x000c02 g_free((char *)s->sin.portname); #endif + qemu_del_timer(s->post_load.timer); + qemu_free_timer(s->post_load.timer); g_free(s); } @@ -205,6 +211,35 @@ static void print_allowed_subtypes(void) fprintf(stderr, "\n"); } +static void spice_chr_post_load_cb(void *opaque) +{ + SpiceCharDriver *s = opaque; + + if (qemu_chr_be_is_fe_connected(s->chr)) { + spice_chr_guest_open(s->chr); + } +} + +static int spice_chr_post_load(void *opaque, int version_id) +{ + SpiceCharDriver *s = opaque; + + if (s && s->chr) { + 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_END_OF_LIST() + }, +}; + static CharDriverState *chr_open(const char *subtype) { CharDriverState *chr; @@ -215,12 +250,16 @@ static CharDriverState *chr_open(const char *subtype) s->chr = chr; s->active = false; s->sin.subtype = g_strdup(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;