From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMH7u-0002hy-4a for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:40:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMH7p-0008Oa-Vr for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:40:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32003) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMH7p-0008Nj-Mz for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:40:25 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9BBeOvg002123 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 11 Oct 2012 07:40:24 -0400 From: Gerd Hoffmann Date: Thu, 11 Oct 2012 13:40:21 +0200 Message-Id: <1349955622-15183-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1349955622-15183-1-git-send-email-kraxel@redhat.com> References: <1349955622-15183-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] usb-redir: Don't make migration fail in none seamless case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hans de Goede , Gerd Hoffmann From: Hans de Goede Instead simple disconnect the device like host redirection does on migration. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- hw/usb/redirect.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 5e0f98d..2283565 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1614,12 +1614,17 @@ static int usbredir_get_parser(QEMUFile *f, void *priv, size_t unused) } /* - * Our chardev should be open already at this point, otherwise - * the usbredir channel will be broken (ie spice without seamless) + * If our chardev is not open already at this point the usbredir connection + * has been broken (non seamless migration, or restore from disk). + * + * In this case create a temporary parser to receive the migration data, + * and schedule the close_bh to report the device as disconnected to the + * guest and to destroy the parser again. */ if (dev->parser == NULL) { - ERROR("get_parser called with closed chardev, failing migration\n"); - return -1; + WARNING("usb-redir connection broken during migration\n"); + usbredir_create_parser(dev); + qemu_bh_schedule(dev->chardev_close_bh); } data = g_malloc(len); -- 1.7.1