Patchwork [16/19] qemu-char: move msmouse registeration to msmouse.c

login
register
mail settings
Submitter Anthony Liguori
Date Feb. 18, 2013, 9:48 p.m.
Message ID <1361224096-21075-17-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/221538/
State New
Headers show

Comments

Anthony Liguori - Feb. 18, 2013, 9:48 p.m.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/msmouse.c | 10 ++++++++--
 hw/msmouse.h |  7 -------
 qemu-char.c  |  8 ++++++--
 3 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 hw/msmouse.h
Amit Shah - March 5, 2013, 5:23 p.m.
On (Mon) 18 Feb 2013 [15:48:13], Anthony Liguori wrote:

> +static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
> +{
> +    return NULL;
> +}

I guess this was to fix up the compile broken by a previous commit.
I've handled this in my rebase.

		Amit

Patch

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 14b0111..3a2f279 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 <unistd.h>
@@ -2179,6 +2178,12 @@  static CharDriverState *qemu_chr_open_win_stdio(QemuOpts *opts)
 }
 #endif /* !_WIN32 */
 
+
+static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
+{
+    return NULL;
+}
+
 /***********************************************************/
 /* UDP Net console */
 
@@ -3653,7 +3658,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", text_console_init);
     register_char_driver("memory", qemu_chr_open_ringbuf);
 #ifdef _WIN32