From patchwork Mon Feb 18 21:48:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 221520 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 1B59B2C0291 for ; Tue, 19 Feb 2013 09:15:59 +1100 (EST) Received: from localhost ([::1]:55323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Yab-00049Y-MA for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 16:49:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7YaD-0003kp-I1 for qemu-devel@nongnu.org; Mon, 18 Feb 2013 16:49:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7YaB-0004Ok-6c for qemu-devel@nongnu.org; Mon, 18 Feb 2013 16:49:09 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:51865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7YaA-0004OE-KP for qemu-devel@nongnu.org; Mon, 18 Feb 2013 16:49:07 -0500 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Feb 2013 03:16:21 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 19 Feb 2013 03:16:20 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id EDD3BE004E for ; Tue, 19 Feb 2013 03:19:59 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1ILn14w33292318 for ; Tue, 19 Feb 2013 03:19:01 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1ILn3ke027437 for ; Tue, 19 Feb 2013 08:49:03 +1100 Received: from titi.austin.rr.com (sig-9-76-14-15.mts.ibm.com [9.76.14.15]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1ILmKBj025719; Tue, 19 Feb 2013 08:49:01 +1100 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 15:48:11 -0600 Message-Id: <1361224096-21075-15-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1361224096-21075-1-git-send-email-aliguori@us.ibm.com> References: <1361224096-21075-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13021821-4790-0000-0000-000006F7892E X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: Amit Shah , Paolo Bonzini , Anthony Liguori Subject: [Qemu-devel] [PATCH 14/19] qemu-char: move spice registration to spice-qemu-char.c 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 Signed-off-by: Anthony Liguori --- qemu-char.c | 6 ------ spice-qemu-char.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 0c375f9..8b4c9a5 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3681,12 +3681,6 @@ static void register_types(void) || defined(__FreeBSD_kernel__) register_char_driver("parport", qemu_chr_open_pp); #endif -#ifdef CONFIG_SPICE - register_char_driver("spicevmc", qemu_chr_open_spice); -#if SPICE_SERVER_VERSION >= 0x000c02 - register_char_driver("spiceport", qemu_chr_open_spice_port); -#endif -#endif } type_init(register_types); diff --git a/spice-qemu-char.c b/spice-qemu-char.c index a4d7de8..aea3d24 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -307,3 +307,13 @@ void qemu_spice_register_ports(void) } } #endif + +static void register_types(void) +{ + register_char_driver("spicevmc", qemu_chr_open_spice); +#if SPICE_SERVER_VERSION >= 0x000c02 + register_char_driver("spiceport", qemu_chr_open_spice_port); +#endif +} + +type_init(register_types);