[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/20] qemu-char: move msmouse registeration to msmo
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 16/20] qemu-char: move msmouse registeration to msmouse.c |
Date: |
Tue, 5 Mar 2013 23:21:31 +0530 |
From: Anthony Liguori <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
---
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 <unistd.h>
@@ -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
--
1.8.1.2
- [Qemu-devel] [PATCH 10/20] char: add gio watch fn for tcp backends, (continued)
- [Qemu-devel] [PATCH 12/20] qemu-char: remove use of QEMUTimer in favor of glib idle function, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 13/20] qemu-char: make char drivers dynamically registerable, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 14/20] qemu-char: move spice registration to spice-qemu-char.c, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 15/20] qemu-char: move baum registration to baum.c, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 16/20] qemu-char: move msmouse registeration to msmouse.c,
Amit Shah <=
- [Qemu-devel] [PATCH 17/20] qemu-char: move text console init to console.c, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 18/20] serial: add flow control to transmit, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 19/20] virtio: console: add flow control, Amit Shah, 2013/03/05
- [Qemu-devel] [PATCH 20/20] virtio-serial: make flow control explicit in virtio-console, Amit Shah, 2013/03/05
- Re: [Qemu-devel] [PATCH 00/20] chardev flow control, Anthony Liguori, 2013/03/11