From patchwork Wed Dec 5 15:15:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 203888 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 4921F2C00AA for ; Thu, 6 Dec 2012 02:16:53 +1100 (EST) Received: from localhost ([::1]:43158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGiO-0002SG-0w for incoming@patchwork.ozlabs.org; Wed, 05 Dec 2012 10:16:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGhw-0001Zd-DD for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgGhe-0007nN-TN for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:14 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:52749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGhe-0007kY-FQ for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:02 -0500 Received: by mail-ea0-f173.google.com with SMTP id i13so2196644eaa.4 for ; Wed, 05 Dec 2012 07:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=uoR9mFX1ZwEUqgEXvi3zWmjC3HY5R3w1q70TJt1nb/c=; b=K13KdmrLB3ThbnZk6Uib6iFmj+RyftFEnZiF6VgY/rFm3WxMM6nyZrDzNrusR5KaEL vKhHCvGgWPS+UbG7dl2xXFkhRoQoGKhsgzxxvJWWFbRi4dZqfWY4bv3MZMpB0Wn5r/s2 U6mNA4RXDp6F6IYMV0b3U+KzQaVF19MLuZo0mK2EvKBsUj8ZB4l5jlepQlNOx9kfhD39 oC4WWX2QQG9a11rqFQMNlu9rbPcH7tuWrb/FRAySi0iCE7Jr8RB/uH5ZCii8wvU8yFUs 51R0oBKOEMKpvHfwjYDCaIIaxFTBB/GviL1mXW2zEoHW+HR4cWJ4y+gY6P21ciUr2anf 5yzQ== Received: by 10.14.0.133 with SMTP id 5mr35815321eeb.29.1354720561061; Wed, 05 Dec 2012 07:16:01 -0800 (PST) Received: from localhost (nat-pool-cdg-t.redhat.com. [209.132.186.20]) by mx.google.com with ESMTPS id 46sm9741228eeg.4.2012.12.05.07.15.59 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Dec 2012 07:16:00 -0800 (PST) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Wed, 5 Dec 2012 16:15:36 +0100 Message-Id: <1354720537-12097-5-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> References: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.215.173 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , alevy@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 5/6] spice-qemu-char: register spicevmc ports during qemu_spice_init() 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 Do the delayed registration of spicevmc ports after Spice server is initialized. --- spice-qemu-char.c | 12 ++++++++++++ ui/qemu-spice.h | 1 + ui/spice-core.c | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 4eb85ae..b2586c2 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -293,4 +293,16 @@ CharDriverState *qemu_chr_open_spice_port(QemuOpts *opts) return chr; } + +void qemu_spice_register_ports(void) +{ + SpiceCharDriver *s; + + QLIST_FOREACH(s, &spice_chars, next) { + if (s->sin.portname == NULL) { + continue; + } + vmc_register_interface(s); + } +} #endif diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h index 5669767..642f012 100644 --- a/ui/qemu-spice.h +++ b/ui/qemu-spice.h @@ -48,6 +48,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data); CharDriverState *qemu_chr_open_spice(QemuOpts *opts); #if SPICE_SERVER_VERSION >= 0x000c02 CharDriverState *qemu_chr_open_spice_port(QemuOpts *opts); +void qemu_spice_register_ports(void); #endif #else /* CONFIG_SPICE */ diff --git a/ui/spice-core.c b/ui/spice-core.c index 261c6f2..ddbcd08 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -714,6 +714,10 @@ void qemu_spice_init(void) g_free(x509_key_file); g_free(x509_cert_file); g_free(x509_cacert_file); + +#if SPICE_SERVER_VERSION >= 0x000c02 + qemu_spice_register_ports(); +#endif } int qemu_spice_add_interface(SpiceBaseInstance *sin)