From patchwork Tue Mar 5 17:51:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 225131 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 5985D2C031A for ; Wed, 6 Mar 2013 04:59:28 +1100 (EST) Received: from localhost ([::1]:33356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCw98-00060W-JV for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 12:59:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCw6n-00025e-62 for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:57:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCw6C-0000Uc-Et for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:57:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCw6C-0000UV-5n for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:56:24 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r25HuMgG013817 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Mar 2013 12:56:22 -0500 Received: from localhost (ovpn-113-84.phx2.redhat.com [10.3.113.84]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r25HuDsX014268; Tue, 5 Mar 2013 12:56:20 -0500 From: Amit Shah To: qemu list Date: Tue, 5 Mar 2013 23:21:31 +0530 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Anthony Liguori , Anthony Liguori Subject: [Qemu-devel] [PATCH 16/20] qemu-char: move msmouse registeration to msmouse.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 From: Anthony Liguori Signed-off-by: Anthony Liguori Signed-off-by: Amit Shah --- hw/msmouse.c | 10 ++++++++-- hw/msmouse.h | 7 ------- qemu-char.c | 3 +-- 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 hw/msmouse.h diff --git a/hw/msmouse.c b/hw/msmouse.c index ef47aed..407ec87 100644 --- a/hw/msmouse.c +++ b/hw/msmouse.c @@ -25,7 +25,6 @@ #include "qemu-common.h" #include "char/char.h" #include "ui/console.h" -#include "msmouse.h" #define MSMOUSE_LO6(n) ((n) & 0x3f) #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) @@ -64,7 +63,7 @@ static void msmouse_chr_close (struct CharDriverState *chr) g_free (chr); } -CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts) +static CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts) { CharDriverState *chr; @@ -76,3 +75,10 @@ CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts) return chr; } + +static void register_types(void) +{ + register_char_driver("msmouse", qemu_chr_open_msmouse); +} + +type_init(register_types); diff --git a/hw/msmouse.h b/hw/msmouse.h deleted file mode 100644 index 8cff3a7..0000000 --- a/hw/msmouse.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef HW_MSMOUSE_H -#define HW_MSMOUSE_H 1 - -/* msmouse.c */ -CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts); - -#endif diff --git a/qemu-char.c b/qemu-char.c index 6fcd2da..cf02cab 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -28,7 +28,6 @@ #include "qemu/timer.h" #include "char/char.h" #include "hw/usb.h" -#include "hw/msmouse.h" #include "qmp-commands.h" #include @@ -2179,6 +2178,7 @@ static CharDriverState *qemu_chr_open_win_stdio(QemuOpts *opts) } #endif /* !_WIN32 */ + /***********************************************************/ /* UDP Net console */ @@ -3663,7 +3663,6 @@ static void register_types(void) register_char_driver("null", qemu_chr_open_null); register_char_driver("socket", qemu_chr_open_socket); register_char_driver("udp", qemu_chr_open_udp); - register_char_driver("msmouse", qemu_chr_open_msmouse); register_char_driver("vc", vc_init); register_char_driver("memory", qemu_chr_open_ringbuf); #ifdef _WIN32